Merge pull request #2 from jonstaff/master

Progress on video package