Merge pull request #2 from andromeda-15/master

Update from original for add uri and url parameters