Fix bug where stopping reseted the video
Merge branch 'master' into gh-pages