Update readme
Merge remote-tracking branch 'origin/redirect-based' into redirect-based

Conflicts:
	README.md