Adapt README
Fix README (Merge)

Conflicts:
	README.md