fix
merge
Merge pull request #27 from PRX/feat/uri-translator

merge problems.