Fixes #119.
Merge pull request #120 from vseventer/master

Fixes #119.