Merge pull request #16 from stealthycoin/michael

Michael
Merge branch 'master' of https://github.com/stealthycoin/toilet_mapper