Get rid of badly formatted comment
Fix header errors
Merge branch 'master' into gh-pages