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