fixed errors
Merge branch 'master' of https://github.com/melzer/game-engine-v1.git