performed minor edits in the documentation
Merge remote-tracking branch 'upstream/master'

Merge with upstream.