Merge pull request #3 from TheMacLab/master

Pulling updates from game-on/master
Merge pull request #28 from vuongaustin/master

Merge pull request #3 from TheMacLab/master