Merge pull request #1 from studer-raimann/develop

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

Version 1.0