Bug #2 and #6 - URL checking fixes and improvements.
Merge branch 'bug_2_and_6' into master-dev