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