Bug fixes
Fixes
Merge branch 'master' of https://github.com/snigelpiss/TestGame