Change path.join to url.resolve for cross-platform compatibility
Merge branch 'hotfix/url-resolve'