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