Merge branch 'gh-pages'
fix preload
Merge branch 'master' into gh-pages