Cleaning up a bit
Merge pull request #12 from oompt/master

Cleaning up a bit