readme update
readme update
Merge branch 'master' into v1.6.0

Conflicts:
	README.md