redapple Merge pull request #160 from pyvideo/ff-data …