Major update
Merge remote-tracking branch 'my/develop' into develop

Conflicts:
	README.md