Merge pull request #143 from icon-Systemhaus-GmbH/master

#142 Return correct type.