Merge pull request #86 from tothfn/master

Fixes #85