Ready update
Fixed merge conflict

Conflicts:
	README.md