Resolves #96
Merge branch 'bugfix-#96' into develop