Updated so that hopefully html is rendered correctly.
Merge branch 'master' into gh-pages