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