Merge pull request #28 from htakahashi/hiro

Hiro
Fix video play bug on 3rd video
Merge branch 'refs/heads/master' into hiro