Improved readme
Merge branch 'master' into release/v0.2.0

Conflicts:
	README.md