Progress towards issue #14
Merge pull request #15 from skial/video

Progress towards issue #14