Merge pull request #68 from pinguo-zhangzhi/Feature1

Feature1ffdfdfddf
zhangzhi