Merge pull request #10 from ebenezergraham/FINCN-157