Merge pull request #3 from TheMacLab/master

Pulling updates from game-on/master