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