again with the fixing
Merge branch 'pages' into gh-pages