fix bugs
Merge pull request #1 from esvit/master

fix bugs