Merge pull request #1047 from zhx828/add-base-url

Merge pull request #1047 from zhx828/add-base-url #232