Close #43
Merge branch 'enhancement-#43' into develop