More changes
Merge pull request #13 from repokoa/gameManager

More changes