testhurz
Merge branch 'master' into clemens

Conflicts:
	README