Merge pull request #22 from dazzle111/master

更新代码