changed from urls to paths
Merge branch 'master' into backbone