Cleanup
Merge pull request #1 from tomlokhorst/master

Cleanup