Enhancement for url parse method

Enhancement for url parse method