manually merging pull request
implementing fix for #91