fix comments in examples
Merge branch 'master' into patch-1