Merge pull request #2 from CocoaChina-editors/master

merge to edit