Edit examples
Edit examples
Merge remote-tracking branch 'origin/master'