Shorten code block to improve display
Merge branch 'master' into gh-pages