More generic url generation
Merge branch 'master' of https://github.com/studio-ahoi/ahoi_portfolio