Close #48 and close #50
Merge branch 'enhancement-#48-#50' into develop