Merge pull request #1 from cherryhill/master

Cleanup