Updated README.md
Merge remote-tracking branch 'origin/master' into release-0.2.0

Conflicts:
	README.md