close #2 with last commit