Merge pull request #1 from MakeAGameNow/master

Update to master