Little code cleanup
Merge remote branch 'origin/master'
Loading game works