merged code von max
Merge pull request #1 from fbrix/dev

merged code von max in den master