Merge pull request #2 from darling0717/master

6. add by darling0717
7.Test add by darling0825
Merge pull request #2 from darling0825/master

同步 from darling0825