changes from harald
Merge branch 'master' of https://github.com/ahoechtl/test

Conflicts:
	README.txt