Close #7

close #6