update of readme
Merge branch 'master' into branch1

Conflicts:
	README.md