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