Adjusted so the header isn't covered up
Merge branch 'master' into gh-pages