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