修复BUG
Merge pull request #15 from macroth/master

Auto merge by kpm server