Merge pull request #86, fixes #85