Some bugs fixed
Merge pull request #1 from hendyzone/master

fix bugs