Merge origin/master

Conflicts:
	Readme.md
Merge origin/master

Conflicts:
	Readme.md