Update docs

Conflicts:
	README.md