Merge pull request #1 from fbrix/dev

merged code von max in den master
Merge pull request #2 from fbrix/dev

Dev in master pullen
no message
Merge branch 'master' into dev