fix #74, may has some problems
Merge pull request #75 from xiechao06/issue74

fix #74, may has some problems