Fixes #2 and fixes #3

Could be better, but the currency package that is being used only converts one way.