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