Minor example fixes
Added new example
Merge remote-tracking branch 'origin/docs' into docs