Merge pull request #3 from mailzwj/master

Auto merge by kpm server