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