change
Merge pull request #3 from guangwong/master

Auto merge by kpm server