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