fixed some URLs
Merge branch 'working-branch'