update readme
Merge branch 'master' into v0.3

Conflicts:
	README.rst