Fix for #34
Merge pull request #63 from matthias-ronge/issue_34

Fix for #34