Merge remote-tracking branch 'andreas/master'

Conflicts:
	README.md