Fix #82.
Merge branch 'issue-82' into develop