已校对
Merge pull request #1 from LCTT/master

20140629更新