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