path corrections.
Merge remote-tracking branch 'adre/master'