Revert "Merge pull request #4 from bambamx/master"
Merge pull request #15 from bambamx/revert-5-test

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