by qianjun;fix bugs
Merge pull request #154 from gogoyqj/master

by qianjun;fix bugs