Merge upstream/master

Conflicts:
	README.md