fix #130
Merge pull request #132 from asgerhallas/fixes

fix #130