Merge pull request #1 from ebenezergraham/FINCN-155