Revert "Merge pull request #45 from Merglasch/neuer-branch"

This reverts commit 55b6ff9d4c6f41d29b365a9a67787be510f823fb, reversing
changes made to 3061741cc3e03217857a7cc37d64e13fd5170fce.
FixDat Shit