Fix for #58
Merge branch 'issue-58' into develop