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