Improve formatting of examples
Merge branch 'master' into stable