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