fix resolution of path names
Merge remote-tracking branch 'gasteve/master'