Merge pull request #8 from Issic47/master

fix some bugs
fix a lot of bugs