Closes #95
Merge branch 'bugfix-#95' into develop