Merge pull request #1 from nanqiu/master

Auto merge by kpm server