Add look for current dir for paths
Merge remote-tracking branch 'origin/devel-conf'