Revert "Merge pull request #107 from Erok21/master"

This reverts commit f9ebd4dc0a26876df373c54a5dd589ccb0657c41, reversing
changes made to 79a0264acd1db28d51c88051f1994832004cb4d0.

@Erok21: The master branch is sacred. Do not merge untested and broken
code into master, ever.