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