Merge git/master

Conflicts:
	README.md
Merge git/master

Conflicts:
	README.md