Merge pull request #1 from NiBu/master

Completed the Directory
search on empty