Removed a lot of junk from my first pull request
Merge pull request #23 from talzag/master

Removed a lot of junk from my first pull request