Merge pull request #1 from kai8406/M3

M3
Merge pull request #2 from kai8406/M3

M3
Merge pull request #3 from kai8406/M3

cleanup
注释的增加
Merge pull request #23 from scottzf/M3

M3