Updating max-width
Merge branch 'master' into gh-pages