Merge pull request #82 from Omarcito/master

Video! (now caught up)