Updated

Conflicts:
	README.md
Update