fixed URL structure
Merge branch 'wip-4'