diff --git a/src/Klein/Request.php b/src/Klein/Request.php
index 6e03b812..ce423988 100644
--- a/src/Klein/Request.php
+++ b/src/Klein/Request.php
@@ -5,7 +5,7 @@
  * @author      Chris O'Hara <cohara87@gmail.com>
  * @author      Trevor Suarez (Rican7) (contributor and v2 refactorer)
  * @copyright   (c) Chris O'Hara
- * @link        https://github.com/chriso/klein.php
+ * @link        https://github.com/klein/klein.php
  * @license     MIT
  */
 
@@ -400,7 +400,7 @@ public function userAgent()
      */
     public function uri()
     {
-        return $this->server->get('REQUEST_URI', '/');
+        return urldecode($this->server->get('REQUEST_URI', '/'));
     }
 
     /**