Merge pull request #93 from james-lawrence/directory-matcher

directory matcher and string fixes