XuJun's commit to test the pull request!
Merge pull request #1 from dayhaha/master

XuJun's commit to test the pull request!