Update README.md
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	README.md