Fixes
Merge pull request #2 from studer-raimann/develop

Fixes