Fix syntax for urls
Merge branch 'master' into production