Merge pull request #2 from jiangzp/master

Update