@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>uHttpSharp</id>
-		<version>0.1.6.21</version>
+		<version>0.1.6.22</version>
 		<title>uHttpSharp</title>
 		<authors>Shani Elharrar, Joe White, Hüseyin Uslu</authors>
 		<owners>Shani Elharrar, Joe White, Hüseyin Uslu</owners>
 
@@ -14,12 +14,15 @@ public TcpClientAdapter(TcpClient client)
             _client = client;
             _stream = _client.GetStream();
 
-            // The next lines are commented out because they caused exceptions, And i'm not sure why it has been added in the first place.
+            // The next lines are commented out because they caused exceptions, 
+            // They have been added because .net doesn't allow me to wait for data (ReadAsyncBlock).
+            // Instead, I've added Task.Delay in MyStreamReader.ReadBuffer when
+            // Read returns without data.
+            
             // See https://github.com/Code-Sharp/uHttpSharp/issues/14
 
             // Read Timeout of one second.
             // _stream.ReadTimeout = 1000;
-
         }
 
         public Stream Stream
 
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -62,6 +63,12 @@ private async Task ReadBuffer()
             do
             {
                 _count = await _underlyingStream.ReadAsync(_middleBuffer, 0, BufferSize).ConfigureAwait(false);
+
+                if (_count == 0)
+                {
+                    // Fix for 100% CPU
+                    await Task.Delay(100).ConfigureAwait(false);
+                }
             }
             while (_count == 0);