minor changes for compilation
Merge branch 'develop' into gh-pages
compiling demo