Merge pull request #988 from Diapolo/URL-Handling