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