Should fix #86
Merge branch 'issue-86' into develop