Merge pull request #1 from latelan/master

同步操作