adding video support
Merge branch 'video'