better match and grab more dirs
Merge remote-tracking branch 'unixtools/master'