Handle more cases of complete URLs

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Merge pull request #5 from mkoistinen/plain_urls_fix

Fix for complete URLs and additions to handle more cases of complete URLs