Cleanup
Merge pull request #1 from infinitetoken/master

Cleanup