Bug Fix and Feature Add

Fixed issue where recursive search used findFile vs findFiles
Added support to not do a recursive search