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