Code Review
Merge pull request #1 from studer-raimann/develop

Code Review from fschmid