update

minor html change
Merge branch 'master' into gh-pages