Fix #65
Merge branch 'bugfix-#65' into develop