Merge pull request #287 from wshafer/master

Fix for IPhone Videos