fix the bugs
Merge pull request #1 from SamQuery/master

fix the bugs