Merge pull request #81 from siren186/master

+ 增加注释内容; * 合并冲突