Merge pull request #2 from moxiao/master

Auto merge by kpm server