Fixes #159
Merge pull request #168 from agrc/159

Fixes #159