Some Bugfixes from mantis.ilias.de
Merge pull request #2 from studer-raimann/develop

Some Bugfixes from mantis.ilias.de