Merge pull request #6 from wendong112/master

update for 2.3.1-1 release