Revert "Merge pull request #40 from atwixtor/master"

This reverts commit b2f6daa69b97d833e88af5513c7ff6e168636377, reversing
changes made to 8e9f485f01901091a856ba62dd3d5f13e70e201c.