fixed the extra space on the right side problem
Merge branch 'master' into gh-pages