edits per Arther's feedback

updated to support .net urls. Still no unit test in there.