Fixed URL linking
Merge branch 'master' into dev