bug fix
bug fix
Merge pull request #70 from sunryuan/master

fix bugs