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