Close #16 and close #23
Merge branch 'enhancement-#16-#23' into develop