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