Merge pull request #1 from cherryhill/master

Cleanup
Merge pull request #2 from btmash/master

Merge pull request #1 from cherryhill/master