merge master in
0.4.0
Merge pull request #37 from SimpleFinance/merge-and-bump

Merge and bump