[Fix] Some bugs
Merge pull request #30 from mirrorcoder/master

[Fix] Some bugs