Preloading working (I hope)
Merge branch 'master' into gh-pages