Fixed bug in findFiles
Merge branch 'master' into newblog: Fixed findFiles