Merge pull request #27 from willkan/master

更新了很多。。
asdf
Merge pull request #14 from lohuvie/master

merge