Fix highlighting on example
Fix highlighting on example
Merge branch 'master' into gh-pages