fix some bug
Merge pull request #1 from suyan/master

fix some bug