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