Close #20 close #21 close #22 close #23
Merge branch 'enhancement-#20-#21-#22-#23' into develop