Fixes issue #98
Merge branch 'issue_98' into develop