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