Merchants and Updates
Merge pull request #24 from Waterloodown/master

Merchants and Updates