Feature/short uri

Solving #16 and maybe a little future proofing.