fixes #95
Merge pull request #96 from fh/topics/issue-95

fixes #95