34 - Changes to demo page
Merge remote-tracking branch 'origin/release' into release