fix mistakes
Merge branch 'master' into v3

Conflicts:
	README.md