Fixed build-errors
Merge branch 'master' into demo