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