Updated both the URL's and added patch for same. Please review.