Fixed error when running server
Merge branch 'master' of https://github.com/thagberg/currency