Tweak HTML
More thorough demo updater
Merge branch 'master' into gh-pages