2th commit
Merge pull request #1 from xiaozhimn/master

2th commit