Merge pull request #2 from CocoaChina-editors/master

merge to edit
Merge pull request #85 from bytegh/master

Merge pull request #2 from CocoaChina-editors/master