Revert "Merge pull request #1 from MaxWiesel/master"
Merge pull request #2 from MaxWiesel/revert-1-master

Revert "Merge pull request #1 from MaxWiesel/master"