Revert "Merge branch 'master' into teppisbranch"

Conflicts:
	README.md