Update README.md
Merge branch 'master' into 0.2

Conflicts:
	README.md