Merge remote-tracking branch 'origin/developement' into gh-pages
embed demo meanwhile
Merge branch 'gh-pages' into developement
fix build and update demo page