Merge pull request #1 from AJAVgames/master

Merge