finished merchant methods
Merge pull request #36 from cbyn/chris

finished merchant methods