Fixed an html validation error
Merge branch 'master' into gh-pages