Add check if game over and few other things
Merge branch 'develop'