Currency conversion function fixes
Merge pull request #7 from yushko/master

Currency conversion function fixes