Merge changes with trish.
Merge branch 'master' of https://github.com/jiver/finex