Merge pull request #5 from AsakuraFuuko/master

感谢@AsakuraFuuko的贡献
审查Merge的代码，添加吃药，细节改进
Merge pull request #1 from wjsjwr/master

合并更新