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