bug修复
Merge pull request #13 from chishang/master

Auto merge by kpm server