Use `path.join` when possible.
Switch to camelCase
Merge branch 'XhmikosR-path.join'