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