Merge pull request #84 from jpschewe/master

Fixes #83