Revert "Fixed stuff"
Merge pull request #105 from YOURsammich/revert-104-master

Revert "Fixed stuff"