Merge branch 'gh-pages'
fixed '}' to size correctly
Merge branch 'master' into gh-pages