Close #68
Merge branch 'enhanement-#68' into develop