Fixes #29: Math is still wrong
Merge pull request #31 from benastan/bugs/expense/29

Fixes #29: Math is still wrong