MP4 support
Handle MP4 being executed with 2 arguments rather than 3
Merge branch 'master' of https://github.com/CJLove/coursera-heterogeneous into CJLove-master