more changes
Merge branch 'master' into mabranch

Conflicts:
	README.md
added hij