Revert "Merge pull request #17 from bambamx/master"
Merge pull request #20 from bambamx/revert-18-test

Revert "Merge pull request #17 from bambamx/master"