fix bugs
Merge pull request #2 from xnimorz/master

fix bugs