Merge pull request #23 from EricWittmann/master

Cleanup