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