Merge pull request #3 from xiaosong/master

Auto merge by kpm server