Fix typo
Add link to live demo
Merge branch 'master' into gh-pages

* master:
  Add link to live demo
  Fix typo