Committing (I presume) Dave's changes
Merge branch 'master' of https://github.com/fweeeb/TAYHP-Video