update demo
Merge branch 'dev' into build