renamed findFirst private property to not override method findFirst
added findFile() and findDirectory() methods
Merge branch 'optimization' into develop