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