Fixed some marketplace bugs
Merge pull request #38 from vcnickerson/mattj/dev

Fixed some marketplace bugs