Improve documentation
Merge remote-tracking branch 'upstream/master' into examples