Use more path.join instead of +
Merge pull request #2 from jvoisin/master

Use more path.join instead of +