fix bugs
Merge pull request #13 from LipuFei/fixes

fix bugs