commit for merge
Merge branch 'master' of https://github.com/arhframe/util
+ fix matching file and folder:
   now on filename and folder name