Update add-currency branch

Merge master into add-currency and add the currency parameter to the rest of the methods