replace inject([]) with map
improved finder
fix regex problems
add support for directory argument