Merge branch 'master' into test

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

Conflicts:
	README.md