Merge branch 'beautified' into gh-pages