Merge pull request #2 from mailzwj/master

Auto merge by kpm server