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