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