5th commit
Merge pull request #4 from xiaozhimn/master

6th commit