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