Merge pull request #32 from mitchellwills/master

Cleanup