updated demo
Merge branch 'master' into feature/cag