merge and close #6