Close #62, fix #62 and close #63
Merge branch 'enhancement-#61' into develop