New Merchant class, bugfixes
Bugfixes for release 0.4.1