Merge pull request #46 from da2ce7/master

Fixes needed for Moneychanger.  Discovered in: https://github.com/Open-Transactions/Moneychanger/pull/67