修改资料ok
Merge pull request #11 from Jayin/master

2.14
Merge pull request #40 from VectorWen/master

2.14 update merge