Merge branch 'master' into a1

Conflicts:
	README.md