Merge pull request #98

This closes #98