Update README.md
Merge branch 'master' into ef-based

Conflicts:
	README.md