Merge pull request #27 from Izakey/FINCN-141