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