Fix Issues...

Fixed #24
Fixed #25
Fixed #30
Merge pull request #31 from JixunMoe/master

Bug Fixes
Thx a lot for JixunMoe's Work xD