diff --git a/src/net45/Extensions/WampSharp.RawSocket/RawSocket/RawSocketClientConnection.cs b/src/net45/Extensions/WampSharp.RawSocket/RawSocket/RawSocketClientConnection.cs
index 6f097339f..dae6f47d5 100644
--- a/src/net45/Extensions/WampSharp.RawSocket/RawSocket/RawSocketClientConnection.cs
+++ b/src/net45/Extensions/WampSharp.RawSocket/RawSocket/RawSocketClientConnection.cs
@@ -3,7 +3,6 @@
 using System.Net.Security;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using SystemEx;
 using Microsoft.IO;
 using WampSharp.Core.Listener;
 using WampSharp.Core.Message;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternBasedPubSubTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternBasedPubSubTests.cs
index 7fd688e64..9dda58b20 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternBasedPubSubTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternBasedPubSubTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using NUnit.Framework;
 using WampSharp.Tests.Wampv2.TestHelpers.Integration;
 using WampSharp.V2;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternRpcTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternRpcTests.cs
index 2490b6ed6..4e4ce3d29 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternRpcTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PatternRpcTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using SystemEx;
 using NUnit.Framework;
 using WampSharp.Core.Serialization;
 using WampSharp.Tests.Wampv2.TestHelpers.Integration;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubReflectionTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubReflectionTests.cs
index 520fa11e0..63861b79f 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubReflectionTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubReflectionTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using WampSharp.Core.Serialization;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubRetainTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubRetainTests.cs
index e8823be27..8d2628e77 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubRetainTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubRetainTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using SystemEx;
 using NUnit.Framework;
 using WampSharp.Tests.Wampv2.TestHelpers.Integration;
 using WampSharp.V2;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubSubjectTupleTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubSubjectTupleTests.cs
index ef67f5025..32f133b3d 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubSubjectTupleTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/PubSubSubjectTupleTests.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using WampSharp.Core.Serialization;
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/SharedRpcTests.cs b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/SharedRpcTests.cs
index 19046f93c..3a9898334 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/SharedRpcTests.cs
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/Integration/SharedRpcTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using NUnit.Framework;
 using WampSharp.Core.Serialization;
 using WampSharp.Tests.Wampv2.TestHelpers.Integration;
diff --git a/src/net45/WampSharp/Core/Listener/Connections/AsyncConnection/AsyncWampConnection.cs b/src/net45/WampSharp/Core/Listener/Connections/AsyncConnection/AsyncWampConnection.cs
index f73632ab8..416b40e94 100644
--- a/src/net45/WampSharp/Core/Listener/Connections/AsyncConnection/AsyncWampConnection.cs
+++ b/src/net45/WampSharp/Core/Listener/Connections/AsyncConnection/AsyncWampConnection.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.Core.Message;
 using WampSharp.Logging;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/IWampAsyncSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/IWampAsyncSubject.cs
new file mode 100644
index 000000000..3789dc004
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/IWampAsyncSubject.cs
@@ -0,0 +1,12 @@
+using System.Reactive.Subjects;
+
+namespace WampSharp.V2
+{
+    /// <summary>
+    /// Represents a <see cref="IAsyncSubject{TSource,TResult}"/> that publishes/receives messages
+    /// via a WAMP topic.
+    /// </summary>
+    public interface IWampAsyncSubject : IAsyncSubject<IWampEvent, IWampSerializedEvent>
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/RawTopicClientAsyncSubscriber.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/RawTopicClientAsyncSubscriber.cs
new file mode 100644
index 000000000..dad48835e
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/RawTopicClientAsyncSubscriber.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using WampSharp.Core.Serialization;
+using WampSharp.V2.Core.Contracts;
+using WampSharp.V2.PubSub;
+
+namespace WampSharp.V2
+{
+    internal class RawTopicClientAsyncSubscriber : IWampRawTopicClientSubscriber
+    {
+        private readonly IAsyncObserver<IWampSerializedEvent> mObserver;
+
+        public RawTopicClientAsyncSubscriber(IAsyncObserver<IWampSerializedEvent> observer)
+        {
+            mObserver = observer;
+        }
+
+        public void Event<TMessage>(IWampFormatter<TMessage> formatter, long publicationId, EventDetails details)
+        {
+            mObserver.OnNextAsync(new WampSerializedEvent<TMessage>(formatter, publicationId, details));
+        }
+
+        public void Event<TMessage>(IWampFormatter<TMessage> formatter, long publicationId, EventDetails details, TMessage[] arguments)
+        {
+            mObserver.OnNextAsync(new WampSerializedEvent<TMessage>(formatter, publicationId, details, arguments));
+        }
+
+        public void Event<TMessage>(IWampFormatter<TMessage> formatter, long publicationId, EventDetails details, TMessage[] arguments, IDictionary<string, TMessage> argumentsKeywords)
+        {
+            mObserver.OnNextAsync(new WampSerializedEvent<TMessage>(formatter, publicationId, details, arguments, argumentsKeywords));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampAsyncSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampAsyncSubject.cs
new file mode 100644
index 000000000..c2d47d076
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampAsyncSubject.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using WampSharp.V2.Core.Contracts;
+
+namespace WampSharp.V2
+{
+    internal abstract class WampAsyncSubject : IWampAsyncSubject
+    {
+        private static readonly PublishOptions EmptyOptions  =
+            new PublishOptions();
+
+        public virtual Task OnNextAsync(IWampEvent value)
+        {
+            PublishOptions options = value.Options ?? EmptyOptions;
+            object[] arguments = value.Arguments;
+            IDictionary<string, object> argumentsKeywords = value.ArgumentsKeywords;
+
+            Task result;
+
+            if (argumentsKeywords != null)
+            {
+                result = Publish(options, arguments, argumentsKeywords);
+            }
+            else if (arguments != null)
+            {
+                result = Publish(options, arguments);
+            }
+            else
+            {
+                result = Publish(options);
+            }
+
+            return result;
+        }
+
+        public virtual Task OnErrorAsync(Exception error)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual Task OnCompletedAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        protected abstract Task Publish(PublishOptions options);
+        protected abstract Task Publish(PublishOptions options, object[] arguments);
+        protected abstract Task Publish(PublishOptions options, object[] arguments,
+            IDictionary<string, object> argumentsKeywords);
+
+        public abstract Task<IAsyncDisposable> SubscribeAsync(IAsyncObserver<IWampSerializedEvent> observer);
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampClientAsyncSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampClientAsyncSubject.cs
new file mode 100644
index 000000000..53b76cdd8
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampClientAsyncSubject.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using WampSharp.Core.Listener;
+using WampSharp.V2.Client;
+using WampSharp.V2.Core.Contracts;
+using WampSharp.V2.Realm;
+
+namespace WampSharp.V2
+{
+    internal class WampClientAsyncSubject : WampAsyncSubject
+    {
+        private readonly IWampTopicProxy mTopic;
+        private readonly IAsyncObservable<IWampSerializedEvent> mObservable;
+
+        public WampClientAsyncSubject(IWampTopicProxy topic, IWampClientConnectionMonitor monitor)
+        {
+            mTopic = topic;
+
+            mObservable = CreateObservable(topic, monitor);
+        }
+
+        private static IAsyncObservable<IWampSerializedEvent> CreateObservable(IWampTopicProxy topic, IWampClientConnectionMonitor monitor)
+        {
+            IObservable<IWampSerializedEvent> connectionError =
+                Observable.FromEventPattern<WampConnectionErrorEventArgs>
+                    (x => monitor.ConnectionError += x,
+                     x => monitor.ConnectionError -= x)
+                          .SelectMany(x => Observable.Throw<IWampSerializedEvent>(x.EventArgs.Exception));
+
+            IObservable<IWampSerializedEvent> connectionComplete =
+                Observable.FromEventPattern<WampSessionCloseEventArgs>
+                    (x => monitor.ConnectionBroken += x,
+                     x => monitor.ConnectionBroken -= x)
+                          .SelectMany(x => Observable.Throw<IWampSerializedEvent>(new WampConnectionBrokenException(x.EventArgs)));
+
+            ClientAsyncObservable messages = new ClientAsyncObservable(topic);
+
+            IObservable<IWampSerializedEvent> connectionNotifications =
+                Observable.Merge(connectionError, connectionComplete);
+
+            IAsyncObservable<IWampSerializedEvent> asyncNotifications =
+                AsyncObservable.ToAsyncObservable(connectionNotifications);
+
+            //IAsyncObservable<IWampSerializedEvent> result = 
+            //    AsyncObservable.Merge(asyncNotifications, messages);
+
+            IAsyncObservable<IWampSerializedEvent> result =
+                new[] {asyncNotifications, messages}.ToObservable()
+                    .ToAsyncObservable()
+                    .Merge();
+
+            return result;
+        }
+
+        protected override Task Publish(PublishOptions options)
+        {
+            return mTopic.Publish(options);
+        }
+
+        protected override Task Publish(PublishOptions options, object[] arguments)
+        {
+            return mTopic.Publish(options, arguments);
+        }
+
+        protected override Task Publish(PublishOptions options, object[] arguments,
+            IDictionary<string, object> argumentsKeywords)
+        {
+            return mTopic.Publish(options, arguments, argumentsKeywords);
+        }
+
+        public override Task<IAsyncDisposable> SubscribeAsync(IAsyncObserver<IWampSerializedEvent> observer)
+        {
+            return mObservable.SubscribeAsync(observer);
+        }
+
+        private class ClientAsyncObservable : IAsyncObservable<IWampSerializedEvent>
+        {
+            private readonly IWampTopicProxy mTopic;
+
+            public ClientAsyncObservable(IWampTopicProxy topic)
+            {
+                mTopic = topic;
+            }
+
+            public Task<IAsyncDisposable> SubscribeAsync(IAsyncObserver<IWampSerializedEvent> observer)
+            {
+                Task<IAsyncDisposable>
+                    task = mTopic.Subscribe(new RawTopicClientAsyncSubscriber(observer), new SubscribeOptions());
+
+                return task;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTopicAsyncSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTopicAsyncSubject.cs
new file mode 100644
index 000000000..9856e7e0d
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTopicAsyncSubject.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Threading.Tasks;
+
+namespace WampSharp.V2
+{
+    internal class WampTopicAsyncSubject<T> : IAsyncSubject<T>
+    {
+        private readonly IWampAsyncSubject mSubject;
+        private readonly IAsyncObservable<T> mObservable;
+
+        public WampTopicAsyncSubject(IWampAsyncSubject subject)
+        {
+            mSubject = subject;
+
+            mObservable =
+                subject.Where(x => x.Arguments != null && x.Arguments.Any())
+                       .Select(x => x.Arguments[0].Deserialize<T>());
+        }
+
+        public Task OnNextAsync(T value)
+        {
+            return mSubject.OnNextAsync(new WampEvent {Arguments = new object[] {value}});
+        }
+
+        public Task OnErrorAsync(Exception error)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task OnCompletedAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IAsyncDisposable> SubscribeAsync(IAsyncObserver<T> observer)
+        {
+            return mObservable.SubscribeAsync(observer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTupleTopicAsyncSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTupleTopicAsyncSubject.cs
new file mode 100644
index 000000000..5b3c441a1
--- /dev/null
+++ b/src/net45/WampSharp/WAMP2/V2/Api/AsyncRx/WampTupleTopicAsyncSubject.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Threading.Tasks;
+
+namespace WampSharp.V2
+{
+    internal class WampTupleTopicAsyncSubject<TTuple> : IAsyncSubject<TTuple>
+    {
+        private readonly IWampAsyncSubject mSubject;
+        private readonly IWampEventValueTupleConverter<TTuple> mConverter;
+        private readonly IAsyncObservable<TTuple> mObservable;
+
+        public WampTupleTopicAsyncSubject(IWampAsyncSubject subject, IWampEventValueTupleConverter<TTuple> converter)
+        {
+            mSubject = subject;
+            mConverter = converter;
+
+            mObservable =
+                mSubject.Select(x => mConverter.ToTuple(x));
+        }
+
+        public Task OnNextAsync(TTuple value)
+        {
+            IWampEvent wampEvent = mConverter.ToEvent(value);
+            return mSubject.OnNextAsync(wampEvent);
+        }
+
+        public Task OnErrorAsync(Exception error)
+        {
+            return mSubject.OnErrorAsync(error);
+        }
+
+        public Task OnCompletedAsync()
+        {
+            return mSubject.OnCompletedAsync();
+        }
+
+        public Task<IAsyncDisposable> SubscribeAsync(IAsyncObserver<TTuple> observer)
+        {
+            return mObservable.SubscribeAsync(observer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Client/WampRealmProxyServiceProvider.cs b/src/net45/WampSharp/WAMP2/V2/Api/Client/WampRealmProxyServiceProvider.cs
index 5a8013ab9..51d9b3322 100644
--- a/src/net45/WampSharp/WAMP2/V2/Api/Client/WampRealmProxyServiceProvider.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Api/Client/WampRealmProxyServiceProvider.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.V2.CalleeProxy;
 using WampSharp.V2.Client;
 using WampSharp.V2.DelegatePubSub;
@@ -106,6 +105,24 @@ public IWampSubject GetSubject(string topicUri)
             return result;
         }
 
+        public IAsyncSubject<TEvent> GetAsyncSubject<TEvent>(string topicUri)
+        {
+            IWampAsyncSubject subject = GetAsyncSubject(topicUri);
+
+            WampTopicAsyncSubject<TEvent> result = new WampTopicAsyncSubject<TEvent>(subject);
+
+            return result;
+        }
+
+        public IWampAsyncSubject GetAsyncSubject(string topicUri)
+        {
+            IWampTopicProxy topicProxy = mProxy.TopicContainer.GetTopicByUri(topicUri);
+
+            WampClientAsyncSubject result = new WampClientAsyncSubject(topicProxy, mProxy.Monitor);
+
+            return result;
+        }
+
         public ISubject<TTuple> GetSubject<TTuple>(string topicUri, IWampEventValueTupleConverter<TTuple> converter)
         {
             IWampSubject subject = GetSubject(topicUri);
@@ -115,6 +132,15 @@ public ISubject<TTuple> GetSubject<TTuple>(string topicUri, IWampEventValueTuple
             return result;
         }
 
+        public IAsyncSubject<TTuple> GetAsyncSubject<TTuple>(string topicUri, IWampEventValueTupleConverter<TTuple> tupleConverter)
+        {
+            IWampAsyncSubject subject = GetAsyncSubject(topicUri);
+
+            WampTupleTopicAsyncSubject<TTuple> result = new WampTupleTopicAsyncSubject<TTuple>(subject, tupleConverter);
+
+            return result;
+        }
+
         public IDisposable RegisterPublisher(object instance)
         {
             return RegisterPublisher(instance, new PublisherRegistrationInterceptor());
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/IWampRealmServiceProvider.cs b/src/net45/WampSharp/WAMP2/V2/Api/IWampRealmServiceProvider.cs
index d1c3df367..81355b304 100644
--- a/src/net45/WampSharp/WAMP2/V2/Api/IWampRealmServiceProvider.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Api/IWampRealmServiceProvider.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.V2.PubSub;
 using WampSharp.V2.Rpc;
 
@@ -103,6 +102,24 @@ public interface IWampRealmServiceProvider
         /// <returns>The requested subject.</returns>
         IWampSubject GetSubject(string topicUri);
 
+        /// <summary>
+        /// Gets a <see cref="IAsyncSubject{TResult}"/> representing a
+        /// WAMP topic in the realm.
+        /// </summary>
+        /// <param name="topicUri">The WAMP topic uri.</param>
+        /// <typeparam name="TEvent"></typeparam>
+        /// <returns>The requested subject.</returns>
+        IAsyncSubject<TEvent> GetAsyncSubject<TEvent>(string topicUri);
+
+        /// <summary>
+        /// Gets a <see cref="IWampAsyncSubject"/> representing a WAMP topic
+        /// in the realm.
+        /// </summary>
+        /// <param name="topicUri">The WAMP topic uri.</param>
+        /// <returns>The requested subject.</returns>
+        IWampAsyncSubject GetAsyncSubject(string topicUri);
+
+
         /// <summary>
         /// Registers an instance of a type having events decorated with
         /// <see cref="WampTopicAttribute"/> to the realm.
@@ -151,6 +168,15 @@ public interface IWampRealmServiceProvider
         /// <returns>The requested subject.</returns>
         ISubject<TTuple> GetSubject<TTuple>(string topicUri, IWampEventValueTupleConverter<TTuple> tupleConverter);
 
+        /// <summary>
+        /// Gets a <see cref="IAsyncSubject{TTuple}"/> representing a
+        /// WAMP topic in the realm.
+        /// </summary>
+        /// <param name="topicUri">The WAMP topic uri.</param>
+        /// <param name="tupleConverter">An interface responsible for converting <see cref="IWampEvent"/>s into <see cref="TTuple"/>s 
+        /// and vice versa</param>
+        /// <returns>The requested subject.</returns>
+        IAsyncSubject<TTuple> GetAsyncSubject<TTuple>(string topicUri, IWampEventValueTupleConverter<TTuple> tupleConverter);
 #endif
 
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs
index 5732bea59..96b2b978c 100644
--- a/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.Core.Listener;
 using WampSharp.V2.Client;
 using WampSharp.V2.Core.Contracts;
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicProxy.cs b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicProxy.cs
index 6be70607e..a1ae48645 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicProxy.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicProxy.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.PubSub;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicSubscriptionProxy.cs b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicSubscriptionProxy.cs
index 71e25664a..50235f3ba 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicSubscriptionProxy.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/Interfaces/IWampTopicSubscriptionProxy.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.PubSub;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs
index d6783ba2e..2fef20cea 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs
@@ -1,7 +1,7 @@
 using System;
+using SystemEx;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.Core.Listener;
 using WampSharp.Core.Serialization;
 using WampSharp.Core.Utilities;
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampTopicProxy.cs b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampTopicProxy.cs
index e759040fc..434e72354 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampTopicProxy.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampTopicProxy.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.PubSub;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/Interfaces/IWampRpcOperationRegistrationProxy.cs b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/Interfaces/IWampRpcOperationRegistrationProxy.cs
index ccaa72a4a..7d3a4356f 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/Interfaces/IWampRpcOperationRegistrationProxy.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/Interfaces/IWampRpcOperationRegistrationProxy.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Rpc;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampCallee.cs b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampCallee.cs
index 58992fff8..8527a14dc 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampCallee.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampCallee.cs
@@ -1,9 +1,9 @@
 using System;
+using SystemEx;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.Core.Listener;
 using WampSharp.Core.Serialization;
 using WampSharp.Core.Utilities;
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampRpcOperationCatalogProxy.cs b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampRpcOperationCatalogProxy.cs
index 648cf0a07..163c63496 100644
--- a/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampRpcOperationCatalogProxy.cs
+++ b/src/net45/WampSharp/WAMP2/V2/Client/Rpc/WampRpcOperationCatalogProxy.cs
@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using WampSharp.Core.Serialization;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Rpc;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/MetaApiEventsBase.cs b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/MetaApiEventsBase.cs
index 72af37430..3769caa3e 100644
--- a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/MetaApiEventsBase.cs
+++ b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/MetaApiEventsBase.cs
@@ -2,7 +2,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.Core.Utilities;
 using WampSharp.V2.Client;
 using WampSharp.V2.Core.Contracts;
diff --git a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/RegistrationEvents.cs b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/RegistrationEvents.cs
index 8eb2225e0..014cc76d4 100644
--- a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/RegistrationEvents.cs
+++ b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/RegistrationEvents.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using SystemEx;
 using WampSharp.V2.Client;
 
 namespace WampSharp.V2.MetaApi
diff --git a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SessionEvents.cs b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SessionEvents.cs
index 567920d2f..9b624b097 100644
--- a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SessionEvents.cs
+++ b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SessionEvents.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Client;
 
 namespace WampSharp.V2.MetaApi
diff --git a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SubscriptionEvents.cs b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SubscriptionEvents.cs
index 23e1c434d..5633d436d 100644
--- a/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SubscriptionEvents.cs
+++ b/src/net45/WampSharp/WAMP2/V2/MetaApi/Client/SubscriptionEvents.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Threading.Tasks;
-#if !ASYNC_DISPOSABLE
-using SystemEx;
-#endif
 using WampSharp.V2.Client;
 
 namespace WampSharp.V2.MetaApi