Add a better description to the demo page
Merge branch 'master' into gh-pages