Merge pull request #2 from DonDavici/videoMaker

Update from upstream