Merge pull request #4 from xiaosong/master

Auto merge by kpm server