Merge pull request #120 from Taapat/MoviePlayer