Merge pull request #1 from ginano/master

update the trunk
tag description
1、修改细节&增加简单模版
Merge pull request #2 from bondyu/master

修改细节&增加简单模版