更新

更新记录
Merge pull request #10 from macroth/master

Auto merge by kpm server