Close #55 and fix #54
Merge branch 'enhancement-#55' into develop