Fully working standard demo.
Merge branch 'demo' into develop