#57
Merge pull request #58 from Arcnor/issue/57

Fixes #57