Fixes #32
Merge branch 'bug-#32' into develop