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