Fixed resume on play
Merge branch 'master' into lesson_one