some bugs
Merge pull request #3 from blackholexyg/master

Fix some bugs