DOCTYPE fix
Merge branch 'master' into gh-pages
fix padding
Merge branch 'master' into gh-pages