Revert "Fixed stuff"
Merge pull request #107 from YOURsammich/revert-106-master

Revert "Fixed stuff"