New demo files
Merge branch 'upstream/master'