Merge pull request #1 from guangwong/master

Auto merge by kpm server