Merging some branche from other repository + adding currency support

Merging some branche from other repository + adding currency support