Some renaming in the examples section
Merge remote-tracking branch 'origin/master'