tiny merchant refactor
even smaller merchant refactor
Merge pull request #55 from dalexj/alex

Alex