Update README.md
Merge pull request #5 from nicolindemann/develop

Update README.md
Merge branch 'develop' #6

Conflicts:
	README.md
Merge pull request #6 from nicolindemann/master

Master