Merge pull request #1 from moxiao/master

Auto merge by kpm server