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