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