modify code
Merge pull request #22 from wangjeaf/master

Auto merge by kpm server