Merge master/master

Conflicts:
	README.md
Merge master/master

Conflicts:
	README.md