Update README.md
Merge branch 'master' into v0.6-beta

Conflicts:
	README.md