Merge pull request #89 from ogwiz2/develop

(fix) Fixed video problem
Made more fixes to video player