ingo's changes
Merge branch 'master' into ingoBranch

Conflicts:
	README.md
Merge pull request #2 from ingoschaal/ingoBranch

Ingo branch