some tweaks for the demo
Merge remote-tracking branch 'origin/master'