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