Merge pull request #120 from azul/feature/search-based-directories

Feature/search based directories