Refactor the uri building, Fixes #54
Version bump v0.3.5