Merge branch 'gh-pages'
demo text change
Merge branch 'master' into gh-pages