rollback pull #39, #close PYM-13
Merge branch 'master' of github.com:DamnWidget/mamba