Merged changes from Tessar
Rename package to 'urlstring' -- tests run OK