Close #36 and close #38
Merge branch 'enhancement-#36-#38' into develop