Update README.md
Merge remote-tracking branch 'upstream/code-review-branch' into code-review-branch

Conflicts:
	README.md