Merchant flag is now working. Closes #5.