05: more tips
Merge branch 'master' into gh-pages