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