commit fix

commit fix
Merge remote-tracking branch 'origin/game'
testing and code tuning

testing and code tuning
code testing-code tuning

code testing-code tuning