Merge branch 'tes2' into master

Conflicts:
	README.md