updates for MarketPlace
Merge pull request #4 from OpsRockin/add_cleanup

updates for MarketPlace