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