fix path lookup
remove demo folder
Merge branch 'master' into gh-pages