cloud
Merge branch 'master' into pr/3

Conflicts:
	README.md