Merge pull request #1 from skanne/master

Heim zu Papa
Merge branch 'soerenholst-master'