@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>uHttpSharp</id>
-		<version>0.1.4.9</version>
+		<version>0.1.4.10</version>
 		<title>uHttpSharp</title>
 		<authors>Shani Elharrar, Joe White, Hüseyin Uslu</authors>
 		<owners>Shani Elharrar, Joe White, Hüseyin Uslu</owners>
 
@@ -19,7 +19,15 @@ public async Task<IHttpRequest> Provide(StreamReader streamReader)
             if (request == null)
                 return null;
 
-            var tokens = request.Split(' ');
+            var firstSpace = request.IndexOf(' ');
+            var lastSpace = request.LastIndexOf(' ');
+
+            var tokens = new []
+            {
+                request.Substring(0, firstSpace),
+                request.Substring(firstSpace + 1, lastSpace - firstSpace - 1),
+                request.Substring(lastSpace + 1)
+            };
 
             if (tokens.Length != 3)
             {