url-fix refactored
Merge pull request #2 from g-div/master

url-fix refactored