modified by chenxinke
Merge pull request #1 from XinkeChen/master

modified by chenxinke