Close #33 and fix #34
Merge branch 'enhancement-#33-bugfix-#34' into develop