fix safari
new pages
Merge branch 'master' into gh-pages