Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
(cherry picked from commit f63eefc)
changed readme