Merge pull request #47 from ivonu/master

Fixed Search/Index/Icons
current path refactoring, catch exceptions
Merge pull request #48 from lukaselmer/current-directory-improvements

current path refactoring, catch exceptions