Currency fixes
Merge pull request #139 from mud-turtles-2014/currency_fixes

Currency fixes