clear timers when stopping the game
Merge branch 'hotfix/bug-1'