Update README.md
Merge branch 'master' into v0.1.1-devel

Conflicts:
	README.md
commit