fix some bugs
Merge pull request #9 from shaohu/master

fix some bugs