Merge origin/master

Conflicts:
	Readme.md