Cleanup
Merge pull request #30 from r-e-d/master

Cleanup