fix crash, clean up.
Merge branch 'master' of https://github.com/fsvieira/balance