Merge pull request #58 from psafont/get-out-of-my

Merge pull request #58 from psafont/get-out-of-my #54