meaningful commit message
Merge pull request #1 from mer8/matthias

meaningful commit message