Merge pull request #7 from willkan/master

合并下
Merge pull request #3 from lohuvie/master

合并下