#1
Merge pull request #1 from kaatze/master

#1 von steffen