Finish work on #85
Merge pull request #86 from ankurdave/vid-varenc

Finish work on #85