close #2 add feature