Polish for demo.
Merge branch 'master' into demo