Changed filename matching to allow numbers in domain names

Fixes #60