Merge pull request #25 from wendong112/2.3.2.testing

optimize merge progress