Merge branch 'master' into gh-pages
test alt math notation
Merge branch 'gh-pages'