Merge branch 'gh-pages'
name change, glyph codes updated
Merge branch 'master' into gh-pages