Add link to demo
Merge branch 'master' into gh-pages
Make line wrap better
Merge branch 'master' into gh-pages