Merge pull request #3 from shakie/master

Removing a few superfluous bits