close #1 2.1 version