Merge pull request #1 from darling0825/master

同步
add by darling0717
Merge pull request #2 from darling0717/master

6. add by darling0717