Update Readme
Update README.md
Merge branch 'master' into devel

Conflicts:
	README.md