Improve headings
Fix formatting of mocha example
Merge remote-tracking branch 'upstream/master' into examples