Merge pull request #1 from videojs/master

Update at 14 June 2014