Merge pull request #2 from xiaosong/master

Auto merge by kpm server