Merge pull request #9 from Izakey/FINCN-123