Update README.md
Update README.md
Update README.md
Merge remote-tracking branch 'timo/master'

Conflicts:
	README.md