Now work with relative URLs
Merge branch 'develop'