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