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