Improve urls
Merge branch 'betterUrls'
bump
Merge branch 'master' into stable