extension video output
Merge branch 'dev' into gustavoBranch