Close #69
Merge branch 'bugfix-#69' into develop