Close #2 close #10
Merge branch 'enhancement-#2-#10' into develop