Fixed issues re. w3c
Merge branch 'master' into gh-pages