diff --git a/Flux.Test/Flux.Test.csproj b/Flux.Test/Flux.Test.csproj
index f2ef5a4..e89ff61 100644
--- a/Flux.Test/Flux.Test.csproj
+++ b/Flux.Test/Flux.Test.csproj
@@ -43,15 +43,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GetRequestParseTest.cs" />
-    <Compile Include="HeaderParserTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="RequestLineParserTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -73,6 +70,9 @@
       <Name>Flux</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="README.md" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Flux.Test/README.md b/Flux.Test/README.md
new file mode 100644
index 0000000..9f93f96
--- /dev/null
+++ b/Flux.Test/README.md
@@ -0,0 +1,7 @@
+Flux.Test
+===
+- At the moment this project is empty because it tested Flux types now implemented by [HttpHelpers](https://github.com/gsscoder/httphelpers).
+- I leave the project in the solution for host new test classes.
+
+Giacomo Stelluti Scala
+gsscoder@gmail.com
\ No newline at end of file
diff --git a/Flux.Test/GetRequestParseTest.cs b/Flux.Test/_GetRequestParseTest.cs
similarity index 100%
rename from Flux.Test/GetRequestParseTest.cs
rename to Flux.Test/_GetRequestParseTest.cs
diff --git a/Flux.Test/HeaderParserTest.cs b/Flux.Test/_HeaderParserTest.cs
similarity index 100%
rename from Flux.Test/HeaderParserTest.cs
rename to Flux.Test/_HeaderParserTest.cs
diff --git a/Flux.Test/RequestLineParserTest.cs b/Flux.Test/_RequestLineParserTest.cs
similarity index 100%
rename from Flux.Test/RequestLineParserTest.cs
rename to Flux.Test/_RequestLineParserTest.cs
diff --git a/Flux.sln.DotSettings.user b/Flux.sln.DotSettings.user
index 0cff375..b55e48a 100644
--- a/Flux.sln.DotSettings.user
+++ b/Flux.sln.DotSettings.user
@@ -3,4 +3,4 @@
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=A552F535564F4684921AF57D39BD034A/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=A552F535564F4684921AF57D39BD034A/Name/@EntryValue">GetRequestParseTest</s:String>
-	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=A552F535564F4684921AF57D39BD034A/XmlSerializedElements/@EntryValue">&lt;Session&gt;&lt;Elements&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.GetRequestParseTest" type="XunitTestClassElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.GetRequestParseTest" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.HeaderParserTest" type="XunitTestClassElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.HeaderParserTest" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.RequestLineParserTest" type="XunitTestClassElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.RequestLineParserTest" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestClassElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.OneHundredConcurrentSimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="OneHundredConcurrentSimpleGet" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.HeaderParserTest.ParsesHeaders" ParentId="xunit:Flux.Test.HeaderParserTest" type="XunitTestMethodElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.HeaderParserTest" methodName="ParsesHeaders" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.RequestLineParserTest.ParsesRequestLine" ParentId="xunit:Flux.Test.RequestLineParserTest" type="XunitTestMethodElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.RequestLineParserTest" methodName="ParsesRequestLine" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.GetRequestParseTest.ParsesRequestLineAndHeadersFromStream" ParentId="xunit:Flux.Test.GetRequestParseTest" type="XunitTestMethodElement" projectId="89BBC848-4B77-4274-B55A-FCE33AA1F9FA" typeName="Flux.Test.GetRequestParseTest" methodName="ParsesRequestLineAndHeadersFromStream" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.SimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="SimpleGet" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.SimpleGetTwiceOnSameConnection" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="SimpleGetTwiceOnSameConnection" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.TenConcurrentSimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="TenConcurrentSimpleGet" skipReason="" /&gt;&lt;/Elements&gt;&lt;/Session&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=A552F535564F4684921AF57D39BD034A/XmlSerializedElements/@EntryValue">&lt;Session&gt;&lt;Elements&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestClassElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.OneHundredConcurrentSimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="OneHundredConcurrentSimpleGet" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.SimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="SimpleGet" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.SimpleGetTwiceOnSameConnection" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="SimpleGetTwiceOnSameConnection" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:Flux.Test.SimpleWeb.WebClientGetTest.TenConcurrentSimpleGet" ParentId="xunit:Flux.Test.SimpleWeb.WebClientGetTest" type="XunitTestMethodElement" projectId="ED3834CC-2672-4045-A303-F153C87BE806" typeName="Flux.Test.SimpleWeb.WebClientGetTest" methodName="TenConcurrentSimpleGet" skipReason="" /&gt;&lt;/Elements&gt;&lt;/Session&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs
new file mode 100644
index 0000000..7f0d293
--- /dev/null
+++ b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs
@@ -0,0 +1,66 @@
+#region License
+//
+// Http Helpers Library: CharExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class CharExtensions
+    {
+        public static bool IsWhiteSpace(this char c)
+        {
+            switch (c)
+            {
+                // Regular
+                case '\f':
+                case '\v':
+                case ' ':
+                case '\t':
+                    return true;
+
+                // Unicode
+                default:
+                    return (c > 127 && char.IsWhiteSpace(c));
+            }
+        }
+
+        public static bool IsLineTerminator(this char c)
+        {
+            switch (c)
+            {
+                case '\xD':
+                case '\xA':
+                case '\x2028':
+                case '\x2029':
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+    }
+}
diff --git a/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs
new file mode 100644
index 0000000..dd8f895
--- /dev/null
+++ b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs
@@ -0,0 +1,61 @@
+#region License
+//
+// Http Helpers Library: StringExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System.Linq;
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class StringExtensions
+    {
+        public static string TrimStartIf(this string value, char c)
+        {
+            return !string.IsNullOrEmpty(value) && c == value[0] ? value.TrimStart(c) : value;
+        }
+
+        public static string TrimStartIf(this string value, params char[] chars)
+        {
+            return !string.IsNullOrEmpty(value) && chars.Any(c => c == value[0]) ? value.TrimStart(chars) : value;
+        }
+
+        public static string TrimEndIf(this string value, char c)
+        {
+            return !string.IsNullOrEmpty(value) && c == value[0] ? value.TrimEnd(c) : value;
+        }
+
+        //public static string TrimStartWhen(this string value, Func<char, bool> match)
+        //{
+        //    if (string.IsNullOrEmpty(value))
+        //    {
+        //        return value;
+        //    }
+        //    value.t
+        //}
+    }
+}
\ No newline at end of file
diff --git a/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs
new file mode 100644
index 0000000..9c18006
--- /dev/null
+++ b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs
@@ -0,0 +1,104 @@
+#region License
+//
+// Http Helpers Library: StringReaderExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System;
+using System.IO;
+using System.Text;
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class StringReaderExtensions
+    {
+        public static string TakeWhile(this StringReader reader, Func<char, bool> predicate)
+        {
+            var builder = new StringBuilder();
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!predicate(ch))
+                {
+                    break;
+                }
+                builder.Append(ch);
+                reader.Read();
+            }
+            return builder.ToString();
+        }
+
+        public static void SkipWhiteSpace(this StringReader reader)
+        {
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!ch.IsWhiteSpace())
+                {
+                    break;
+                }
+                reader.Read();
+            }
+        }
+
+        public static int SkipWhile(this StringReader reader, Func<char, bool> predicate)
+        {
+            var skipped = 0;
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!predicate(ch))
+                {
+                    break;
+                }
+                skipped++;
+                reader.Read();
+            }
+            return skipped;
+        }
+
+        public static char PeekChar(this StringReader reader)
+        {
+            return (char) reader.Peek();
+        }
+    }
+}
diff --git a/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs
new file mode 100644
index 0000000..7740d8f
--- /dev/null
+++ b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs
@@ -0,0 +1,94 @@
+#region License
+//
+// Http Helpers Library: HttpParser.RawParser.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System;
+using System.IO;
+using HttpHelpers.Extensions;
+#endregion
+
+namespace HttpHelpers
+{
+    partial class HttpParser
+    {
+        private static class RawParser 
+        {
+            public static bool ParseHeadingLine(string line, Action<string, string, string> onHeadingLine)
+            {
+                if (string.IsNullOrWhiteSpace(line))
+                {
+                    return false;
+                }
+
+                var stringReader = new StringReader(line);
+
+                var item1 = stringReader.TakeWhile(c => !c.IsWhiteSpace());
+                if (!stringReader.PeekChar().IsWhiteSpace())
+                {
+                    return false;
+                }
+                stringReader.SkipWhiteSpace();
+
+                var item2 = stringReader.TakeWhile(c => !c.IsWhiteSpace());
+                if (!stringReader.PeekChar().IsWhiteSpace())
+                {
+                    return false;
+                }
+                stringReader.SkipWhiteSpace();
+
+                var item3 = stringReader.ReadToEnd();
+
+                onHeadingLine(item1, item2, item3);
+
+                return true;
+            }
+
+            public static bool ParseHeaderLine(string line, Action<string, string> onHeaderLine)
+            {
+                var stringReader = new StringReader(line);
+
+                stringReader.SkipWhiteSpace();
+
+                var header = stringReader.TakeWhile(c => c != '\x3A');
+                if (stringReader.PeekChar() != '\x3A')
+                {
+                    return false;
+                }
+                stringReader.Read();
+
+                stringReader.SkipWhiteSpace();
+
+                var value = stringReader.ReadToEnd();
+
+                onHeaderLine(header, value ?? string.Empty);
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs
new file mode 100644
index 0000000..6d43eb1
--- /dev/null
+++ b/Flux/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs
@@ -0,0 +1,137 @@
+#region License
+//
+// Http Helpers Library: HttpParser.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Preprocessor Directives
+// When using source distribution, uncomment the following line to
+// disable async API
+#define NO_ASYNC_API
+#endregion
+#region Using Directives
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+#endregion
+
+namespace HttpHelpers
+{
+    public static partial class HttpParser
+    {
+#if !NO_ASYNC_API
+        public static async Task<bool> ParseMessageAsync(Stream stream,
+            Action<string, string, string> onHeadingLine,
+            Action<string, string> onHeaderLine)
+        {
+            // why Debug.Assert? in production code there's no excuse to pass null delegates
+            Debug.Assert(onHeadingLine != null);
+            Debug.Assert(onHeaderLine != null);
+
+            if (stream == null) { throw new ArgumentNullException("stream"); }
+
+            var reader = new StreamReader(stream);
+
+            var headingParsing = await ParseHeadingLineAsync(reader, onHeadingLine);
+            if (!headingParsing)
+            {
+                return false;
+            }
+
+            while (true)
+            {
+                var headerParsing = await ParseHeaderLineAsync(reader, onHeaderLine);
+                if (headerParsing == null)
+                {
+                    break;
+                }
+                if (!headerParsing.Value)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static async Task<bool> ParseHeadingLineAsync(StreamReader reader,
+            Action<string, string, string> onHeadingLine)
+        {
+            var line = await reader.ReadLineAsync();
+
+            return RawParser.ParseHeadingLine(line, onHeadingLine);
+        }
+
+        private static async Task<bool?> ParseHeaderLineAsync(StreamReader reader,
+            Action<string, string> onHeaderLine)
+        {
+            var line = await reader.ReadLineAsync();
+            if (line.Length == 0)
+            {
+                return null;
+            }
+
+            return RawParser.ParseHeaderLine(line, onHeaderLine);
+        }
+#endif
+
+        public static bool ParseMessage(Stream stream,
+            Action<string, string, string> onHeadingLine,
+            Action<string, string> onHeaderLine)
+        {
+            // why Debug.Assert? in production code there's no excuse to pass null delegates
+            Debug.Assert(onHeadingLine != null);
+            Debug.Assert(onHeaderLine != null);
+
+            if (stream == null) { throw new ArgumentNullException("stream"); }
+
+            var reader = new StreamReader(stream);
+
+            var headingParsing = RawParser.ParseHeadingLine(reader.ReadLine(), onHeadingLine);
+            if (!headingParsing)
+            {
+                return false;
+            }
+
+            while (true)
+            {
+                var headerLine = reader.ReadLine();
+                headerLine = headerLine ?? string.Empty;
+                if (headerLine.Length == 0)
+                {
+                    break;
+                }
+                var headerParsing = RawParser.ParseHeaderLine(headerLine, onHeaderLine);
+                if (!headerParsing)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Flux/Flux.csproj b/Flux/Flux.csproj
index 15f6e5e..37927ed 100644
--- a/Flux/Flux.csproj
+++ b/Flux/Flux.csproj
@@ -47,14 +47,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="App_Packages\HttpHelpers.Sources.0.1.6-alfa\Extensions\CharExtensions.cs" />
+    <Compile Include="App_Packages\HttpHelpers.Sources.0.1.6-alfa\Extensions\StringExtensions.cs" />
+    <Compile Include="App_Packages\HttpHelpers.Sources.0.1.6-alfa\Extensions\StringReaderExtensions.cs" />
+    <Compile Include="App_Packages\HttpHelpers.Sources.0.1.6-alfa\HttpParser.cs" />
+    <Compile Include="App_Packages\HttpHelpers.Sources.0.1.6-alfa\HttpParser.RawParser.cs" />
     <Compile Include="BufferStream.cs" />
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="DisposableEx.cs" />
-    <Compile Include="HeaderParser.cs" />
     <Compile Include="InvalidRequestException.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="RequestLine.cs" />
-    <Compile Include="RequestLineParser.cs" />
     <Compile Include="Server.cs" />
     <Compile Include="Instance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Flux/Instance.cs b/Flux/Instance.cs
index ab178a4..ddb7679 100644
--- a/Flux/Instance.cs
+++ b/Flux/Instance.cs
@@ -1,3 +1,6 @@
+using System.Collections;
+using HttpHelpers;
+
 namespace Flux
 {
     using System;
@@ -53,8 +56,7 @@ public Task Run()
             try
             {
                 var env = CreateEnvironmentDictionary();
-                var headers = HeaderParser.Parse(_networkStream);
-                env[OwinKeys.RequestHeaders] = headers;
+                var headers = (IDictionary<string, string[]>)env[OwinKeys.RequestHeaders];
                 env[OwinKeys.ResponseHeaders] = new Dictionary<string, string[]>();
                 env[OwinKeys.ResponseBody] = Buffer;
                 string[] expectContinue;
@@ -88,13 +90,25 @@ private Dictionary<string, object> CreateEnvironmentDictionary()
                           {
                               {OwinKeys.Version, "0.8"}
                           };
-            var requestLine = RequestLineParser.Parse(_networkStream);
-            env[OwinKeys.RequestMethod] = requestLine.Method;
+            var readUri = string.Empty;
+            IDictionary<string, string[]> headers = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
+            HttpParser.ParseMessage(_networkStream, (method, uri, version) =>
+                {
+                    env[OwinKeys.RequestMethod] = method;
+                    readUri = uri;
+                    env[OwinKeys.RequestProtocol] = version;
+                },
+                (header, value) =>
+                    // REMARKS: previous implementation created one entry each new line, instead Owin spec say:
+                    // (1) all header value in a single entry, (2) one entry for each value by comma, (3) a mix of these
+                    headers.Add(header, new[] {value})
+                );
+            env[OwinKeys.RequestHeaders] = headers;
             env[OwinKeys.RequestPathBase] = string.Empty;
-            if (requestLine.Uri.StartsWith("http", StringComparison.InvariantCultureIgnoreCase))
+            if (readUri.StartsWith("http", StringComparison.InvariantCultureIgnoreCase))
             {
                 Uri uri;
-                if (Uri.TryCreate(requestLine.Uri, UriKind.Absolute, out uri))
+                if (Uri.TryCreate(readUri, UriKind.Absolute, out uri))
                 {
                     env[OwinKeys.RequestPath] = uri.AbsolutePath;
                     env[OwinKeys.RequestQueryString] = uri.Query;
@@ -103,7 +117,7 @@ private Dictionary<string, object> CreateEnvironmentDictionary()
             }
             else
             {
-                var splitUri = requestLine.Uri.Split('?');
+                var splitUri = readUri.Split('?');
                 env[OwinKeys.RequestPath] = splitUri[0];
                 env[OwinKeys.RequestQueryString] = splitUri.Length == 2 ? splitUri[1] : string.Empty;
                 env[OwinKeys.RequestScheme] = "http";
diff --git a/Flux/HeaderParser.cs b/Flux/_HeaderParser.cs
similarity index 100%
rename from Flux/HeaderParser.cs
rename to Flux/_HeaderParser.cs
diff --git a/Flux/RequestLine.cs b/Flux/_RequestLine.cs
similarity index 100%
rename from Flux/RequestLine.cs
rename to Flux/_RequestLine.cs
diff --git a/Flux/RequestLineParser.cs b/Flux/_RequestLineParser.cs
similarity index 100%
rename from Flux/RequestLineParser.cs
rename to Flux/_RequestLineParser.cs
diff --git a/Flux/packages.config b/Flux/packages.config
index a6d60e9..e6b6455 100644
--- a/Flux/packages.config
+++ b/Flux/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Fix" version="0.3.0.6" targetFramework="net40" />
+  <package id="HttpHelpers.Sources" version="0.1.6-alfa" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nupkg b/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nupkg
new file mode 100644
index 0000000..d589813
Binary files /dev/null and b/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nupkg differ
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nuspec b/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nuspec
new file mode 100644
index 0000000..50010ac
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/HttpHelpers.Sources.0.1.6-alfa.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
+  <metadata>
+    <id>HttpHelpers.Sources</id>
+    <version>0.1.6-alfa</version>
+    <title>HTTP Helpers</title>
+    <authors>Giacomo Stelluti Scala</authors>
+    <owners>Giacomo Stelluti Scala</owners>
+    <licenseUrl>https://raw.github.com/gsscoder/httphelpers/master/doc/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/gsscoder/httphelpers</projectUrl>
+    <iconUrl>https://raw.github.com/gsscoder/httphelpers/master/HttpHelpers.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>The library exposes an asynchronous HTTP request and response parser.</description>
+    <copyright>2013 Giacomo Stelluti Scala</copyright>
+    <tags>HTTP Message Request Response Parser Helpers</tags>
+    <references />
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs
new file mode 100644
index 0000000..7f0d293
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/CharExtensions.cs
@@ -0,0 +1,66 @@
+#region License
+//
+// Http Helpers Library: CharExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class CharExtensions
+    {
+        public static bool IsWhiteSpace(this char c)
+        {
+            switch (c)
+            {
+                // Regular
+                case '\f':
+                case '\v':
+                case ' ':
+                case '\t':
+                    return true;
+
+                // Unicode
+                default:
+                    return (c > 127 && char.IsWhiteSpace(c));
+            }
+        }
+
+        public static bool IsLineTerminator(this char c)
+        {
+            switch (c)
+            {
+                case '\xD':
+                case '\xA':
+                case '\x2028':
+                case '\x2029':
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+    }
+}
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs
new file mode 100644
index 0000000..dd8f895
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringExtensions.cs
@@ -0,0 +1,61 @@
+#region License
+//
+// Http Helpers Library: StringExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System.Linq;
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class StringExtensions
+    {
+        public static string TrimStartIf(this string value, char c)
+        {
+            return !string.IsNullOrEmpty(value) && c == value[0] ? value.TrimStart(c) : value;
+        }
+
+        public static string TrimStartIf(this string value, params char[] chars)
+        {
+            return !string.IsNullOrEmpty(value) && chars.Any(c => c == value[0]) ? value.TrimStart(chars) : value;
+        }
+
+        public static string TrimEndIf(this string value, char c)
+        {
+            return !string.IsNullOrEmpty(value) && c == value[0] ? value.TrimEnd(c) : value;
+        }
+
+        //public static string TrimStartWhen(this string value, Func<char, bool> match)
+        //{
+        //    if (string.IsNullOrEmpty(value))
+        //    {
+        //        return value;
+        //    }
+        //    value.t
+        //}
+    }
+}
\ No newline at end of file
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs
new file mode 100644
index 0000000..9c18006
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/Extensions/StringReaderExtensions.cs
@@ -0,0 +1,104 @@
+#region License
+//
+// Http Helpers Library: StringReaderExtensions.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System;
+using System.IO;
+using System.Text;
+#endregion
+
+namespace HttpHelpers.Extensions
+{
+    static class StringReaderExtensions
+    {
+        public static string TakeWhile(this StringReader reader, Func<char, bool> predicate)
+        {
+            var builder = new StringBuilder();
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!predicate(ch))
+                {
+                    break;
+                }
+                builder.Append(ch);
+                reader.Read();
+            }
+            return builder.ToString();
+        }
+
+        public static void SkipWhiteSpace(this StringReader reader)
+        {
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!ch.IsWhiteSpace())
+                {
+                    break;
+                }
+                reader.Read();
+            }
+        }
+
+        public static int SkipWhile(this StringReader reader, Func<char, bool> predicate)
+        {
+            var skipped = 0;
+            while (true)
+            {
+                var raw = reader.Peek();
+                if (raw == -1)
+                {
+                    break;
+                }
+                var ch = (char)raw;
+                if (!predicate(ch))
+                {
+                    break;
+                }
+                skipped++;
+                reader.Read();
+            }
+            return skipped;
+        }
+
+        public static char PeekChar(this StringReader reader)
+        {
+            return (char) reader.Peek();
+        }
+    }
+}
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs
new file mode 100644
index 0000000..7740d8f
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.RawParser.cs
@@ -0,0 +1,94 @@
+#region License
+//
+// Http Helpers Library: HttpParser.RawParser.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Using Directives
+using System;
+using System.IO;
+using HttpHelpers.Extensions;
+#endregion
+
+namespace HttpHelpers
+{
+    partial class HttpParser
+    {
+        private static class RawParser 
+        {
+            public static bool ParseHeadingLine(string line, Action<string, string, string> onHeadingLine)
+            {
+                if (string.IsNullOrWhiteSpace(line))
+                {
+                    return false;
+                }
+
+                var stringReader = new StringReader(line);
+
+                var item1 = stringReader.TakeWhile(c => !c.IsWhiteSpace());
+                if (!stringReader.PeekChar().IsWhiteSpace())
+                {
+                    return false;
+                }
+                stringReader.SkipWhiteSpace();
+
+                var item2 = stringReader.TakeWhile(c => !c.IsWhiteSpace());
+                if (!stringReader.PeekChar().IsWhiteSpace())
+                {
+                    return false;
+                }
+                stringReader.SkipWhiteSpace();
+
+                var item3 = stringReader.ReadToEnd();
+
+                onHeadingLine(item1, item2, item3);
+
+                return true;
+            }
+
+            public static bool ParseHeaderLine(string line, Action<string, string> onHeaderLine)
+            {
+                var stringReader = new StringReader(line);
+
+                stringReader.SkipWhiteSpace();
+
+                var header = stringReader.TakeWhile(c => c != '\x3A');
+                if (stringReader.PeekChar() != '\x3A')
+                {
+                    return false;
+                }
+                stringReader.Read();
+
+                stringReader.SkipWhiteSpace();
+
+                var value = stringReader.ReadToEnd();
+
+                onHeaderLine(header, value ?? string.Empty);
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs
new file mode 100644
index 0000000..5731a84
--- /dev/null
+++ b/packages/HttpHelpers.Sources.0.1.6-alfa/content/App_Packages/HttpHelpers.Sources.0.1.6-alfa/HttpParser.cs
@@ -0,0 +1,137 @@
+#region License
+//
+// Http Helpers Library: HttpParser.cs
+//
+// Author:
+//   Giacomo Stelluti Scala (gsscoder@gmail.com)
+//
+// Copyright (C) 2013 Giacomo Stelluti Scala
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#endregion
+#region Preprocessor Directives
+// When using source distribution, uncomment the following line to
+// disable async API
+//#define NO_ASYNC_API
+#endregion
+#region Using Directives
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+#endregion
+
+namespace HttpHelpers
+{
+    public static partial class HttpParser
+    {
+#if !NO_ASYNC_API
+        public static async Task<bool> ParseMessageAsync(Stream stream,
+            Action<string, string, string> onHeadingLine,
+            Action<string, string> onHeaderLine)
+        {
+            // why Debug.Assert? in production code there's no excuse to pass null delegates
+            Debug.Assert(onHeadingLine != null);
+            Debug.Assert(onHeaderLine != null);
+
+            if (stream == null) { throw new ArgumentNullException("stream"); }
+
+            var reader = new StreamReader(stream);
+
+            var headingParsing = await ParseHeadingLineAsync(reader, onHeadingLine);
+            if (!headingParsing)
+            {
+                return false;
+            }
+
+            while (true)
+            {
+                var headerParsing = await ParseHeaderLineAsync(reader, onHeaderLine);
+                if (headerParsing == null)
+                {
+                    break;
+                }
+                if (!headerParsing.Value)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static async Task<bool> ParseHeadingLineAsync(StreamReader reader,
+            Action<string, string, string> onHeadingLine)
+        {
+            var line = await reader.ReadLineAsync();
+
+            return RawParser.ParseHeadingLine(line, onHeadingLine);
+        }
+
+        private static async Task<bool?> ParseHeaderLineAsync(StreamReader reader,
+            Action<string, string> onHeaderLine)
+        {
+            var line = await reader.ReadLineAsync();
+            if (line.Length == 0)
+            {
+                return null;
+            }
+
+            return RawParser.ParseHeaderLine(line, onHeaderLine);
+        }
+#endif
+
+        public static bool ParseMessage(Stream stream,
+            Action<string, string, string> onHeadingLine,
+            Action<string, string> onHeaderLine)
+        {
+            // why Debug.Assert? in production code there's no excuse to pass null delegates
+            Debug.Assert(onHeadingLine != null);
+            Debug.Assert(onHeaderLine != null);
+
+            if (stream == null) { throw new ArgumentNullException("stream"); }
+
+            var reader = new StreamReader(stream);
+
+            var headingParsing = RawParser.ParseHeadingLine(reader.ReadLine(), onHeadingLine);
+            if (!headingParsing)
+            {
+                return false;
+            }
+
+            while (true)
+            {
+                var headerLine = reader.ReadLine();
+                headerLine = headerLine ?? string.Empty;
+                if (headerLine.Length == 0)
+                {
+                    break;
+                }
+                var headerParsing = RawParser.ParseHeaderLine(headerLine, onHeaderLine);
+                if (!headerParsing)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file