normal commit
Merge pull request #3 from citicup/wjn

normal commit