fixes
Merge pull request #1 from studer-raimann/develop

fixes