Fix and test for issue #10
Merge branch 'master' of github.com:StratusLab/marketplace