Replace path.join
Merge pull request #655 from andrerod/dev

Replace path.join