Add border to video
Merge branch 'master' into gh-pages

* master:
  Add border to video