diff --git a/laravel/bundle.php b/laravel/bundle.php
index 1ef4d8c0..382051ea 100644
--- a/laravel/bundle.php
+++ b/laravel/bundle.php
@@ -191,7 +191,7 @@ public static function handles($uri)
 
 		foreach (static::$bundles as $key => $value)
 		{
-			if (isset($value['handles']) and starts_with($uri, $value['handles'].'/'))
+			if (isset($value['handles']) and starts_with($uri, $value['handles'].'/') or $value['handles'] == '/')
 			{
 				return $key;
 			}
diff --git a/laravel/routing/router.php b/laravel/routing/router.php
index 0f162305..e9935e4c 100644
--- a/laravel/routing/router.php
+++ b/laravel/routing/router.php
@@ -206,7 +206,12 @@ public static function register($method, $route, $action)
 				continue;
 			}
 
-			$uri = str_replace('(:bundle)', static::$bundle, $uri);
+			$uri = ltrim(str_replace('(:bundle)', static::$bundle, $uri), '/');
+			
+			if($uri == '')
+			{
+				$uri = '/';
+			}
 
 			// If the URI begins with a wildcard, we want to add this route to the
 			// array of "fallback" routes. Fallback routes are always processed