Cleanup
Merge pull request #2 from mottosso/master

Cleanup