Fixed bug #101
Merge pull request #102 from matthias-ronge/issue_101

Bugfix for #101