Gui game - 2
Merge origin/master