Merge pull request #119 from heiglandreas/hotfix/errors

Fixes an error
Fixes more errors