Merge pull request #5 from LCTT/master

啊
已翻译 by小眼儿

Signed-off-by: tinyeyeser <tinyeyeser@gmail.com>
Merge pull request #608 from tinyeyeser/master

已翻译 by小眼儿