Update README.md
Merge remote-tracking branch 'origin/master' into ST-Basic-functionality

Conflicts:
	README.md