Revert "Merge pull request #3 from altern/master"

This reverts commit 6c105738f670b8e37a98d698747b53309fbb7c5b, reversing
changes made to 2d64efab618b32e850d63f00a1e286b7c88f70e3.

The pull request broke the code so I reverted it. Next time I will do my pull requests in a separate branch to test them out.