Merge pull request #1 from unclecheese/master

Merge from uncle cheese:master