updated demos
Merge branch 'dev'