Merge remote-tracking branch 'origin/master' into gh-pages
minor tweaks to demo
minor tweaks
fixing history
Merge branch 'gh-pages', remote-tracking branch 'origin'