Upgraded to URI 0.9.1