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