Fixed game start and end
Merge pull request #28 from Elao/develop

Fixed game start and end