Merge origin/master into FactoryPattern

Conflicts:
	README.md
Merge origin/master into FactoryPattern

Conflicts:
	README.md