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