Fixes #141
Merge branch 'issue141'