Changes due to refactor
Fixes, fixes and yes, more fixes
Merge pull request #499 from owdqa/feature/video_refactor

Feature/video refactor