Fixes #85.
Merge branch 'issue-85' into develop