Merge pull request #1 from xiaosong/master

Auto merge by kpm server