fix bugs
Merge pull request #1 from 0q0/master

fix bugs