Examples
Some corrections
Merge remote-tracking branch 'origin/release/0.5' into release/0.5