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