diff --git a/.gitignore b/.gitignore
index 0479af7..caf28df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,13 @@
 src/Owin.WebSocket/bin
 src/Owin.WebSocket/obj
-src/Owin.WebSocket/packages
+src/Owin.WebSocket.Fleck/bin
+src/Owin.WebSocket.Fleck/obj
 src/packages
 src/UnitTests/bin
 src/UnitTests/obj
-src/build
+src/UnitTests.Fleck/bin
+src/UnitTests.Fleck/obj
+*.DotSettings
 *.dll
 *.pdb
 *.suo
diff --git a/src/Owin.WebSocket.Fleck/Extensions/AppBuilderExtensions.cs b/src/Owin.WebSocket.Fleck/Extensions/AppBuilderExtensions.cs
new file mode 100644
index 0000000..2947114
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Extensions/AppBuilderExtensions.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Text.RegularExpressions;
+using Fleck;
+using Microsoft.Practices.ServiceLocation;
+
+namespace Owin.WebSocket.Extensions
+{
+    public static class AppBuilderExtensions
+    {
+        public static IAppBuilder MapFleckRoute(this IAppBuilder app, Action<IWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+        {
+            return app.MapFleckRoute(string.Empty, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapFleckRoute(this IAppBuilder app, string route, Action<IWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+        {
+            return app.MapFleckRoute<FleckWebSocketConnection>(route, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapFleckRoute<T>(this IAppBuilder app, Action<IWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+            where T : FleckWebSocketConnection, new()
+        {
+            return app.MapFleckRoute<T>(string.Empty, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapFleckRoute<T>(this IAppBuilder app, string route, Action<IWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+            where T : FleckWebSocketConnection, new()
+        {
+            var regex = string.IsNullOrWhiteSpace(regexPatternMatch) ? null : new Regex(regexPatternMatch, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            return app.Map(route, a => a.Use<FleckWebSocketConnectionMiddleware<T>>(config, locator, regex));
+        }
+        
+        public static IAppBuilder MapOwinFleckRoute(this IAppBuilder app, Action<IOwinWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+        {
+            return app.MapOwinFleckRoute(string.Empty, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapOwinFleckRoute(this IAppBuilder app, string route, Action<IOwinWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+        {
+            return app.MapOwinFleckRoute<FleckWebSocketConnection>(route, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapOwinFleckRoute<T>(this IAppBuilder app, Action<IOwinWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+            where T : FleckWebSocketConnection, new()
+        {
+            return app.MapOwinFleckRoute<T>(string.Empty, config, locator, regexPatternMatch);
+        }
+
+        public static IAppBuilder MapOwinFleckRoute<T>(this IAppBuilder app, string route, Action<IOwinWebSocketConnection> config, IServiceLocator locator = null, string regexPatternMatch = null)
+            where T : FleckWebSocketConnection, new()
+        {
+            var regex = string.IsNullOrWhiteSpace(regexPatternMatch) ? null : new Regex(regexPatternMatch, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            return app.Map(route, a => a.Use<FleckWebSocketConnectionMiddleware<T>>(config, locator, regex));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/FleckWebSocketConnection.cs b/src/Owin.WebSocket.Fleck/FleckWebSocketConnection.cs
new file mode 100644
index 0000000..c711898
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/FleckWebSocketConnection.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Linq;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading.Tasks;
+using Fleck;
+using Microsoft.Owin;
+using Owin.WebSocket.Models;
+
+namespace Owin.WebSocket
+{
+    public class FleckWebSocketConnection : WebSocketConnection, IOwinWebSocketConnection
+    {
+        private const string PingPongError = "Owin handles ping pong messages internally";
+
+        private readonly OwinWebSocketContext _context;
+        private readonly IOwinWebSocketConnection _connection;
+        private readonly IWebSocketConnectionInfo _connectionInfo;
+
+        private bool _isAvailable;
+        
+        public FleckWebSocketConnection()
+            : this(1024*64)
+        {
+        }
+
+        public FleckWebSocketConnection(int maxMessageSize)
+            : base(maxMessageSize)
+        {
+            _connection = this;
+            _context = new OwinWebSocketContext(_connection.Context, MaxMessageSize);
+            _connectionInfo = new FleckWebSocketConnectionInfo(_connection.Context);
+        }
+
+        #region WebSocketConnection
+
+        public override bool AuthenticateRequest(IOwinRequest request)
+        {
+            return _connection.OnAuthenticateRequest?.Invoke() ?? true;
+        }
+
+        public override Task<bool> AuthenticateRequestAsync(IOwinRequest request)
+        {
+            return _connection.OnAuthenticateRequestAsync?.Invoke() ?? Task.FromResult(true);
+        }
+
+        public override void OnOpen()
+        {
+            _isAvailable = true;
+            _connection.OnOpen?.Invoke();
+        }
+
+        public override Task OnOpenAsync()
+        {
+            return _connection.OnOpenAsync?.Invoke() ?? Task.FromResult(true);
+        }
+        
+        public override void OnClose(WebSocketCloseStatus? closeStatus, string closeStatusDescription)
+        {
+            _isAvailable = false;
+            _context.CloseStatus = closeStatus;
+            _context.CloseStatusDescription = closeStatusDescription;
+            _connection.OnClose?.Invoke();
+        }
+
+        public override Task OnCloseAsync(WebSocketCloseStatus? closeStatus, string closeStatusDescription)
+        {
+            return _connection.OnCloseAsync?.Invoke() ?? Task.FromResult(true);
+        }
+
+        public override Task OnMessageReceived(ArraySegment<byte> message, WebSocketMessageType type)
+        {
+            if (type == WebSocketMessageType.Binary && (_connection.OnBinary != null || _connection.OnBinaryAsync != null))
+            {
+                var array = message.ToArray();
+                _connection.OnBinary?.Invoke(array);
+                return _connection.OnBinaryAsync?.Invoke(array) ?? Task.FromResult(true);
+            }
+
+            if (type == WebSocketMessageType.Text && (_connection.OnMessage != null || _connection.OnMessageAsync!= null))
+            {
+                var @string = Encoding.UTF8.GetString(message.Array, 0, message.Count);
+                _connection.OnMessage?.Invoke(@string);
+                return _connection.OnMessageAsync?.Invoke(@string) ?? Task.FromResult(true);
+            }
+
+            return Task.FromResult(true);
+        }
+
+        public override void OnReceiveError(Exception error)
+        {
+            _connection.OnError?.Invoke(error);
+        }
+
+        #endregion
+
+        #region IOwinWebSocketConnection
+
+        IOwinWebSocketContext IOwinWebSocketConnection.Context => _context;
+        Func<Task> IOwinWebSocketConnection.OnOpenAsync { get; set; }
+        Func<Task> IOwinWebSocketConnection.OnCloseAsync { get; set; }
+        Func<string, Task> IOwinWebSocketConnection.OnMessageAsync { get; set; }
+        Func<byte[], Task> IOwinWebSocketConnection.OnBinaryAsync { get; set; }
+        Func<bool> IOwinWebSocketConnection.OnAuthenticateRequest { get; set; }
+        Func<Task<bool>> IOwinWebSocketConnection.OnAuthenticateRequestAsync { get; set; }
+
+        #endregion
+
+        #region IWebSocketConnection
+
+        Action IWebSocketConnection.OnOpen { get; set; }
+        Action IWebSocketConnection.OnClose { get; set; }
+        Action<string> IWebSocketConnection.OnMessage { get; set; }
+        Action<byte[]> IWebSocketConnection.OnBinary { get; set; }
+        Action<Exception> IWebSocketConnection.OnError { get; set; }
+
+        Action<byte[]> IWebSocketConnection.OnPing
+        {
+            get { return null; }
+            set { throw new NotSupportedException(PingPongError); }
+        }
+
+        Action<byte[]> IWebSocketConnection.OnPong
+        {
+            get { return null; }
+            set { throw new NotSupportedException(PingPongError); }
+        }
+
+        IWebSocketConnectionInfo IWebSocketConnection.ConnectionInfo => _connectionInfo;
+        bool IWebSocketConnection.IsAvailable => _isAvailable;
+
+        Task IWebSocketConnection.Send(string message)
+        {
+            var bytes = Encoding.UTF8.GetBytes(message);
+            return SendText(bytes, true);
+        }
+
+        Task IWebSocketConnection.Send(byte[] message)
+        {
+            return SendBinary(message, true);
+        }
+
+        Task IWebSocketConnection.SendPing(byte[] message)
+        {
+            throw new NotSupportedException(PingPongError);
+        }
+
+        Task IWebSocketConnection.SendPong(byte[] message)
+        {
+            throw new NotSupportedException(PingPongError);
+        }
+
+        void IWebSocketConnection.Close()
+        {
+            Close(WebSocketCloseStatus.NormalClosure, string.Empty).Wait();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/FleckWebSocketConnectionMiddleware.cs b/src/Owin.WebSocket.Fleck/FleckWebSocketConnectionMiddleware.cs
new file mode 100644
index 0000000..6c0d746
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/FleckWebSocketConnectionMiddleware.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Fleck;
+using Microsoft.Owin;
+using Microsoft.Practices.ServiceLocation;
+
+namespace Owin.WebSocket
+{
+    public class FleckWebSocketConnectionMiddleware<T> : OwinMiddleware
+        where T : FleckWebSocketConnection, new()
+    {
+        private readonly Action<IWebSocketConnection> _config;
+        private readonly Action<IOwinWebSocketConnection> _owinConfig;
+        private readonly IServiceLocator _locator;
+        private readonly Regex _matchPattern;
+        
+        public FleckWebSocketConnectionMiddleware(OwinMiddleware next, Action<IWebSocketConnection> config, IServiceLocator locator, Regex matchPattern)
+            : this(next, locator, matchPattern)
+        {
+            _config = config;
+        }
+
+        public FleckWebSocketConnectionMiddleware(OwinMiddleware next, Action<IOwinWebSocketConnection> config, IServiceLocator locator, Regex matchPattern)
+            : this(next, locator, matchPattern)
+        {
+            _owinConfig = config;
+        }
+        
+        private FleckWebSocketConnectionMiddleware(OwinMiddleware next, IServiceLocator locator, Regex matchPattern)
+            : base(next)
+        {
+            _locator = locator;
+            _matchPattern = matchPattern;
+        }
+
+        public override Task Invoke(IOwinContext context)
+        {
+            var matches = new Dictionary<string, string>();
+
+            if (_matchPattern != null)
+            {
+                var match = _matchPattern.Match(context.Request.Path.Value);
+                if (!match.Success)
+                    return Next.Invoke(context);
+
+                for (var i = 1; i <= match.Groups.Count; i++)
+                {
+                    var name = _matchPattern.GroupNameFromNumber(i);
+                    var value = match.Groups[i];
+                    matches.Add(name, value.Value);
+                }
+            }
+
+            var connection = _locator?.GetInstance<T>() ?? new T();
+
+            _config?.Invoke(connection);
+            _owinConfig?.Invoke(connection);
+
+            return connection.AcceptSocketAsync(context, matches);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/IOwinWebSocketConnection.cs b/src/Owin.WebSocket.Fleck/IOwinWebSocketConnection.cs
new file mode 100644
index 0000000..3c42355
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/IOwinWebSocketConnection.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading.Tasks;
+using Fleck;
+using Owin.WebSocket.Models;
+
+namespace Owin.WebSocket
+{
+    public interface IOwinWebSocketConnection : IWebSocketConnection
+    {
+        IOwinWebSocketContext Context { get; }
+        Func<Task> OnOpenAsync { get; set; }
+        Func<Task> OnCloseAsync { get; set; }
+        Func<string, Task> OnMessageAsync { get; set; }
+        Func<byte[], Task> OnBinaryAsync { get; set; }
+        Func<bool> OnAuthenticateRequest { get; set; }
+        Func<Task<bool>> OnAuthenticateRequestAsync { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/Models/FleckWebSocketConnectionInfo.cs b/src/Owin.WebSocket.Fleck/Models/FleckWebSocketConnectionInfo.cs
new file mode 100644
index 0000000..f944311
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Models/FleckWebSocketConnectionInfo.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Fleck;
+using Microsoft.Owin;
+
+namespace Owin.WebSocket.Models
+{
+    public class FleckWebSocketConnectionInfo : IWebSocketConnectionInfo
+    {
+        private readonly IOwinContext _context;
+
+        public FleckWebSocketConnectionInfo(IOwinContext context)
+        {
+            _context = context;
+        }
+
+        string IWebSocketConnectionInfo.SubProtocol
+        {
+            get
+            {
+                const string protocol = "Sec-WebSocket-Protocol";
+                return _context.Request.Headers.ContainsKey(protocol)
+                    ? _context.Request.Headers[protocol]
+                    : string.Empty;
+            }
+        }
+
+        string IWebSocketConnectionInfo.Origin
+        {
+            get
+            {
+                const string origin1 = "Origin";
+                if (_context.Request.Headers.ContainsKey(origin1))
+                    return _context.Request.Headers[origin1];
+
+                const string origin2 = "Sec-WebSocket-Origin";
+                return _context.Request.Headers.ContainsKey(origin2)
+                    ? _context.Request.Headers[origin2]
+                    : string.Empty;
+            }
+        }
+
+        string IWebSocketConnectionInfo.Host => _context.Request.Host.Value;
+        string IWebSocketConnectionInfo.Path => _context.Request.Path.Value;
+        string IWebSocketConnectionInfo.ClientIpAddress => _context.Request.RemoteIpAddress;
+        int IWebSocketConnectionInfo.ClientPort => _context.Request.RemotePort ?? 0;
+        IDictionary<string, string> IWebSocketConnectionInfo.Cookies => _context.Request.Cookies.ToDictionary(k => k.Key, v => v.Value);
+        IDictionary<string, string> IWebSocketConnectionInfo.Headers => _context.Request.Headers.SelectMany(p => p.Value.Select(v => new { p.Key, Value = v })).ToDictionary(k => k.Key, v => v.Value);
+
+        Guid IWebSocketConnectionInfo.Id { get; } = Guid.NewGuid();
+        string IWebSocketConnectionInfo.NegotiatedSubProtocol { get; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/Models/IOwinWebSocketContext.cs b/src/Owin.WebSocket.Fleck/Models/IOwinWebSocketContext.cs
new file mode 100644
index 0000000..7bd0c36
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Models/IOwinWebSocketContext.cs
@@ -0,0 +1,12 @@
+using System.Net.WebSockets;
+using Microsoft.Owin;
+
+namespace Owin.WebSocket.Models
+{
+    public interface IOwinWebSocketContext : IOwinContext
+    {
+        int MaxMessageSize { get; }
+        WebSocketCloseStatus? CloseStatus { get; }
+        string CloseStatusDescription { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/Models/OwinWebSocketContext.cs b/src/Owin.WebSocket.Fleck/Models/OwinWebSocketContext.cs
new file mode 100644
index 0000000..b05d4e0
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Models/OwinWebSocketContext.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Net.WebSockets;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+
+namespace Owin.WebSocket.Models
+{
+    public class OwinWebSocketContext : IOwinWebSocketContext
+    {
+        private readonly IOwinContext _context;
+
+        public OwinWebSocketContext(IOwinContext context, int maxMessageSize)
+        {
+            _context = context;
+            MaxMessageSize = maxMessageSize;
+        }
+
+        public T Get<T>(string key)
+        {
+            return _context.Get<T>(key);
+        }
+
+        public IOwinContext Set<T>(string key, T value)
+        {
+            return _context.Set(key, value);
+        }
+
+        public IOwinRequest Request => _context.Request;
+        public IOwinResponse Response => _context.Response;
+        public IAuthenticationManager Authentication => _context.Authentication;
+        public IDictionary<string, object> Environment => _context.Environment;
+
+        public TextWriter TraceOutput
+        {
+            get { return _context.TraceOutput; }
+            set { _context.TraceOutput = value; }
+        }
+
+        public int MaxMessageSize { get; }
+        public WebSocketCloseStatus? CloseStatus { get; set; }
+        public string CloseStatusDescription { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/Owin.WebSocket.Fleck.csproj b/src/Owin.WebSocket.Fleck/Owin.WebSocket.Fleck.csproj
new file mode 100644
index 0000000..82094b6
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Owin.WebSocket.Fleck.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{32050A9E-3FC9-4A71-85BF-6645AE68B82B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Owin.WebSocket</RootNamespace>
+    <AssemblyName>Owin.WebSocket.Fleck</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Fleck, Version=0.13.0.57, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Fleck.0.13.0.57\lib\net40\Fleck.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Extensions\AppBuilderExtensions.cs" />
+    <Compile Include="FleckWebSocketConnection.cs" />
+    <Compile Include="Models\FleckWebSocketConnectionInfo.cs" />
+    <Compile Include="FleckWebSocketConnectionMiddleware.cs" />
+    <Compile Include="IOwinWebSocketConnection.cs" />
+    <Compile Include="Models\IOwinWebSocketContext.cs" />
+    <Compile Include="Models\OwinWebSocketContext.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Owin.WebSocket\Owin.WebSocket.csproj">
+      <Project>{b1d742f7-39fa-498c-b22e-1a7a61c301e7}</Project>
+      <Name>Owin.WebSocket</Name>
+    </ProjectReference>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Owin.WebSocket.Fleck/Properties/AssemblyInfo.cs b/src/Owin.WebSocket.Fleck/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..86a9fb6
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Owin.WebSocket.Fleck")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Owin.WebSocket.Fleck")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("32050a9e-3fc9-4a71-85bf-6645ae68b82b")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Owin.WebSocket.Fleck/packages.config b/src/Owin.WebSocket.Fleck/packages.config
new file mode 100644
index 0000000..58dd4e4
--- /dev/null
+++ b/src/Owin.WebSocket.Fleck/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
+  <package id="Fleck" version="0.13.0.57" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
+  <package id="Owin" version="1.0" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/src/Owin.WebSocket.sln b/src/Owin.WebSocket.sln
index 76019f0..0c90524 100644
--- a/src/Owin.WebSocket.sln
+++ b/src/Owin.WebSocket.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.WebSocket", "Owin.WebSocket\Owin.WebSocket.csproj", "{B1D742F7-39FA-498C-B22E-1A7A61C301E7}"
 EndProject
@@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{8DCED5
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.WebSocket.Fleck", "Owin.WebSocket.Fleck\Owin.WebSocket.Fleck.csproj", "{32050A9E-3FC9-4A71-85BF-6645AE68B82B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.Fleck", "UnitTests.Fleck\UnitTests.Fleck.csproj", "{7D1CEED6-9BAE-4A54-8902-71DE01112070}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,6 +32,14 @@ Global
 		{E8AAA2FB-EA74-4120-B0A0-838926422AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8AAA2FB-EA74-4120-B0A0-838926422AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8AAA2FB-EA74-4120-B0A0-838926422AF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32050A9E-3FC9-4A71-85BF-6645AE68B82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32050A9E-3FC9-4A71-85BF-6645AE68B82B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32050A9E-3FC9-4A71-85BF-6645AE68B82B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32050A9E-3FC9-4A71-85BF-6645AE68B82B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D1CEED6-9BAE-4A54-8902-71DE01112070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D1CEED6-9BAE-4A54-8902-71DE01112070}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D1CEED6-9BAE-4A54-8902-71DE01112070}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D1CEED6-9BAE-4A54-8902-71DE01112070}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Owin.WebSocket/WebSocketConnection.cs b/src/Owin.WebSocket/WebSocketConnection.cs
index a8de6b8..f369f43 100644
--- a/src/Owin.WebSocket/WebSocketConnection.cs
+++ b/src/Owin.WebSocket/WebSocketConnection.cs
@@ -34,7 +34,7 @@ public abstract class WebSocketConnection
         /// Queue of send operations to the client
         /// </summary>
         public TaskQueue QueueSend { get { return mWebSocket.SendQueue;} }
-
+        
         protected WebSocketConnection(int maxMessageSize = 1024*64)
         {
             mCancellToken = new CancellationTokenSource();
@@ -180,13 +180,11 @@ public virtual Task OnCloseAsync(WebSocketCloseStatus? closeStatus, string close
         public virtual void OnReceiveError(Exception error)
         {
         }
-
+        
         /// <summary>
         /// Receive one entire message from the web socket
         /// </summary>
-
-
-        internal async Task AcceptSocketAsync(IOwinContext context, IDictionary<string, string> argumentMatches)
+        public async Task AcceptSocketAsync(IOwinContext context, IDictionary<string, string> argumentMatches)
         {
             var accept = context.Get<Action<IDictionary<string, object>, Func<IDictionary<string, object>, Task>>>("websocket.Accept");
             if (accept == null)
@@ -219,7 +217,6 @@ internal async Task AcceptSocketAsync(IOwinContext context, IDictionary<string,
                     //user was authorized so accept the socket
                     accept(null, RunWebSocket);
                     return;
-
                 }
             }
 
diff --git a/src/UnitTests.Fleck/FleckTests.cs b/src/UnitTests.Fleck/FleckTests.cs
new file mode 100644
index 0000000..d0cfa54
--- /dev/null
+++ b/src/UnitTests.Fleck/FleckTests.cs
@@ -0,0 +1,21 @@
+using Fleck;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Fleck
+{
+    [TestClass]
+    public class FleckTests : FleckTestsBase
+    {
+        [TestMethod]
+        public void FeatureParityTest()
+        {
+            using (var server = new WebSocketServer("http://127.0.0.1:8989"))
+            {
+                server.Start(ConfigureIntegrationTestConnection);
+                SendIntegrationTestMessages();
+            }
+
+            AssertIntegrationTestMessages();
+        }
+    }
+}
diff --git a/src/UnitTests.Fleck/FleckTestsBase.cs b/src/UnitTests.Fleck/FleckTestsBase.cs
new file mode 100644
index 0000000..f3a5766
--- /dev/null
+++ b/src/UnitTests.Fleck/FleckTestsBase.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Fleck;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Fleck
+{
+    public abstract class FleckTestsBase
+    {
+        private readonly ConcurrentDictionary<int, IWebSocketConnection> _connections = new ConcurrentDictionary<int, IWebSocketConnection>();
+        private readonly ConcurrentQueue<string> _messages = new ConcurrentQueue<string>();
+
+        private int _idSeed;
+
+        protected void AddConnection(int id, IWebSocketConnection connection)
+        {
+            _connections.TryAdd(id, connection);
+        }
+
+        protected void RemoveConnection(int id)
+        {
+            IWebSocketConnection connection;
+            _connections.TryRemove(id, out connection);
+        }
+
+        protected void Send(int id, string message)
+        {
+            _messages.Enqueue(message);
+
+            if (id == -1)
+                return;
+
+            foreach (var connectionPair in _connections)
+            {
+                if (!connectionPair.Value.IsAvailable)
+                    continue;
+
+                if (connectionPair.Key == id)
+                    continue;
+
+                connectionPair.Value.Send(message).Wait();
+            }
+        }
+
+        protected IList<string> DequeueMessages()
+        {
+            var results = new List<string>(_messages.Count);
+            string message;
+            while (_messages.TryDequeue(out message))
+            {
+                results.Add(message);
+            }
+
+            return results;
+        }
+
+        protected void ConfigureIntegrationTestConnection(IWebSocketConnection connection)
+        {
+            ConfigureIntegrationTestConnectionAndGetId(connection);
+        }
+
+        protected int ConfigureIntegrationTestConnectionAndGetId(IWebSocketConnection connection)
+        {
+            var id = Interlocked.Increment(ref _idSeed);
+
+            connection.OnOpen = () =>
+            {
+                AddConnection(id, connection);
+                Send(id, $"Open: {id}");
+            };
+            connection.OnClose = () =>
+            {
+                Send(id, $"Close: {id}");
+                RemoveConnection(id);
+            };
+            connection.OnError = ex =>
+            {
+                Send(-1, $"Error: {id} - {ex.ToString()}");
+            };
+            connection.OnMessage = m =>
+            {
+                Send(id, $"User {id}: {m}");
+            };
+
+            return id;
+        }
+
+        protected void SendIntegrationTestMessages()
+        {
+            using (var client1 = new ClientWebSocket())
+            using (var client2 = new ClientWebSocket())
+            {
+                client1.ConnectAsync(new Uri("ws://localhost:8989"), CancellationToken.None).Wait();
+                Task.Delay(100).Wait();
+
+                client2.ConnectAsync(new Uri("ws://localhost:8989"), CancellationToken.None).Wait();
+                Task.Delay(100).Wait();
+
+                var bytes2 = new byte[1024];
+                var segment2 = new ArraySegment<byte>(bytes2);
+                var receive2 = client2.ReceiveAsync(segment2, CancellationToken.None);
+
+                var message1 = "Hello world";
+                var bytes1 = Encoding.UTF8.GetBytes(message1);
+                var segment1 = new ArraySegment<byte>(bytes1);
+                client1.SendAsync(segment1, WebSocketMessageType.Text, true, CancellationToken.None).Wait();
+                Task.Delay(100).Wait();
+
+                var result2 = receive2.Result;
+                Assert.AreEqual(WebSocketMessageType.Text, result2.MessageType);
+                var message3 = Encoding.UTF8.GetString(segment2.Array, 0, result2.Count);
+                Assert.AreEqual("User 1: Hello world", message3);
+
+                client2.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).Wait();
+                client2.Dispose();
+                Task.Delay(100).Wait();
+
+                client1.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).Wait();
+                client1.Dispose();
+                Task.Delay(100).Wait();
+            }
+        }
+
+        protected void AssertIntegrationTestMessages()
+        {
+            var messages = DequeueMessages();
+            Assert.AreEqual(5, messages.Count);
+            Assert.AreEqual("Open: 1", messages[0]);
+            Assert.AreEqual("Open: 2", messages[1]);
+            Assert.AreEqual("User 1: Hello world", messages[2]);
+            Assert.AreEqual("Close: 2", messages[3]);
+            Assert.AreEqual("Close: 1", messages[4]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/UnitTests.Fleck/OwinFleckTests.cs b/src/UnitTests.Fleck/OwinFleckTests.cs
new file mode 100644
index 0000000..8dc42c4
--- /dev/null
+++ b/src/UnitTests.Fleck/OwinFleckTests.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Owin.Hosting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Owin.WebSocket.Extensions;
+
+namespace UnitTests.Fleck
+{
+    [TestClass]
+    public class OwinFleckTests : FleckTestsBase
+    {
+        [TestMethod]
+        public void FeatureParityTest()
+        {
+            using (WebApp.Start(new StartOptions("http://localhost:8989"), startup =>
+            {
+                startup.MapOwinFleckRoute(ConfigureIntegrationTestConnection);
+            }))
+            {
+                SendIntegrationTestMessages();
+                AssertIntegrationTestMessages();
+            }
+        }
+
+        [TestMethod]
+        public void AuthorizationTest()
+        {
+            using (WebApp.Start(new StartOptions("http://localhost:8989"), startup =>
+            {
+                startup.MapOwinFleckRoute("/fleck", connection =>
+                {
+                    var id = ConfigureIntegrationTestConnectionAndGetId(connection);
+                    
+                    connection.OnAuthenticateRequest = () =>
+                    {
+                        var result = id % 2 == 1;
+                        Send(id, $"Auth {id}: {result}");
+                        return result;
+                    };
+
+                });
+            }))
+            using (var client1 = new ClientWebSocket())
+            using (var client2 = new ClientWebSocket())
+            using (var client3 = new ClientWebSocket())
+            {
+                client1.ConnectAsync(new Uri("ws://localhost:8989/fleck"), CancellationToken.None).Wait();
+                
+                try
+                {
+                    client2.ConnectAsync(new Uri("ws://localhost:8989/fleck"), CancellationToken.None).Wait();
+                    Assert.Fail("Client 2 should not be unauthorized");
+                }
+                catch (AggregateException ex)
+                {
+                    Assert.AreEqual("Unable to connect to the remote server", ex.InnerException.Message);
+                }
+                
+                client3.ConnectAsync(new Uri("ws://localhost:8989/fleck"), CancellationToken.None).Wait();
+
+                var bytes3 = new byte[1024];
+                var segment3 = new ArraySegment<byte>(bytes3);
+                var receive3 = client3.ReceiveAsync(segment3, CancellationToken.None);
+
+                var message1 = "Hello world";
+                var bytes1 = Encoding.UTF8.GetBytes(message1);
+                var segment1 = new ArraySegment<byte>(bytes1);
+                client1.SendAsync(segment1, WebSocketMessageType.Text, true, CancellationToken.None).Wait();
+
+                var result3 = receive3.Result;
+                Assert.AreEqual(WebSocketMessageType.Text, result3.MessageType);
+                var message3 = Encoding.UTF8.GetString(segment3.Array, 0, result3.Count);
+                Assert.AreEqual(message3, "User 1: Hello world");
+
+                client3.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).Wait();
+                client3.Dispose();
+                Task.Delay(100).Wait();
+
+                client1.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).Wait();
+                client1.Dispose();
+                Task.Delay(100).Wait();
+            }
+
+            var messages = DequeueMessages();
+            Assert.AreEqual(8, messages.Count);
+            Assert.AreEqual("Auth 1: True", messages[0]);
+            Assert.AreEqual("Open: 1", messages[1]);
+            Assert.AreEqual("Auth 2: False", messages[2]);
+            Assert.AreEqual("Auth 3: True", messages[3]);
+            Assert.AreEqual("Open: 3", messages[4]);
+            Assert.AreEqual("User 1: Hello world", messages[5]);
+            Assert.AreEqual("Close: 3", messages[6]);
+            Assert.AreEqual("Close: 1", messages[7]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/UnitTests.Fleck/Properties/AssemblyInfo.cs b/src/UnitTests.Fleck/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3245973
--- /dev/null
+++ b/src/UnitTests.Fleck/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("UnitTests.Fleck")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UnitTests.Fleck")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7d1ceed6-9bae-4a54-8902-71de01112070")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/UnitTests.Fleck/UnitTests.Fleck.csproj b/src/UnitTests.Fleck/UnitTests.Fleck.csproj
new file mode 100644
index 0000000..d2c55dc
--- /dev/null
+++ b/src/UnitTests.Fleck/UnitTests.Fleck.csproj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7D1CEED6-9BAE-4A54-8902-71DE01112070}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UnitTests.Fleck</RootNamespace>
+    <AssemblyName>UnitTests.Fleck</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Fleck, Version=0.13.0.57, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Fleck.0.13.0.57\lib\net40\Fleck.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Diagnostics, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Diagnostics.3.0.1\lib\net45\Microsoft.Owin.Diagnostics.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FleckTests.cs" />
+    <Compile Include="FleckTestsBase.cs" />
+    <Compile Include="OwinFleckTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Owin.WebSocket.Fleck\Owin.WebSocket.Fleck.csproj">
+      <Project>{32050a9e-3fc9-4a71-85bf-6645ae68b82b}</Project>
+      <Name>Owin.WebSocket.Fleck</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Owin.WebSocket\Owin.WebSocket.csproj">
+      <Project>{b1d742f7-39fa-498c-b22e-1a7a61c301e7}</Project>
+      <Name>Owin.WebSocket</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/UnitTests.Fleck/packages.config b/src/UnitTests.Fleck/packages.config
new file mode 100644
index 0000000..b949e11
--- /dev/null
+++ b/src/UnitTests.Fleck/packages.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
+  <package id="Fleck" version="0.13.0.57" targetFramework="net452" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Diagnostics" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.SelfHost" version="3.0.1" targetFramework="net452" />
+  <package id="Owin" version="1.0" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index b57db46..85e9042 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTests</RootNamespace>
     <AssemblyName>UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -18,6 +18,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Owin.WebSocket\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/UnitTests/WebSocketTests.cs b/src/UnitTests/WebSocketTests.cs
index c3e9f32..ea19ea7 100644
--- a/src/UnitTests/WebSocketTests.cs
+++ b/src/UnitTests/WebSocketTests.cs
@@ -35,7 +35,7 @@ public static void Init(TestContext test)
         {
             sResolver = new TestResolver();
 
-            WebApp.Start(new StartOptions("http://localhost:8989"), startup =>
+            sWeb = WebApp.Start(new StartOptions("http://localhost:8989"), startup =>
             {
                 startup.MapWebSocketRoute<TestConnection>();
                 startup.MapWebSocketRoute<TestConnection>("/ws", sResolver);
diff --git a/src/UnitTests/app.config b/src/UnitTests/app.config
index 66e9d66..2687008 100644
--- a/src/UnitTests/app.config
+++ b/src/UnitTests/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>