Merge pull request from dshukertjr/feature/video_play Drastically improved video play performance