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

Don't know what I'm doing