Merge pull request #1 from jianyuan/master

Update