Merge pull request #1 from cherryhill/master

Lots of fixes