Merge branch 'gh-pages'
checkboxes to enable and disabled features

still some performance issues
Merge branch 'master' into gh-pages