fix bugs
Merge pull request #8 from 11693-01/master

fix bugs