Merge branch 'master' into gh-pages
Slight style adjustment on demo page
Merge branch 'gh-pages'