modify readme
Merge branch 'master' into new

Conflicts:
	README.md