Merge origin/master

Conflicts:
	README.md
Merge origin/master