Merge pull request #8 from ebenezergraham/FINCN-157