Merge pull request #897 from nethraravindran/urlcomponents-branch