Merge pull request #1 from lohuvie/master

update
Merge pull request #2 from lohuvie/master

merge
合并先
Merge pull request #7 from willkan/master

合并下