Additional tests regarding filenames and middle-of-word matches
Merge pull request #1 from dsblank/master

Additional tests regarding filenames and middle-of-word matches