Merchant system fix
Merge pull request #27 from cosme12/patch-25

Merchant system fix