Cleanup
Merge pull request #13 from TheCryoknight/master

Cleanup