Merge branch 'master' into gh-pages
better demo
Merge branch 'gh-pages'