diff --git a/OBD.NET/OBD.NET.Common/Communication/EventArgs/DataReceivedEventArgs.cs b/OBD.NET/OBD.NET.Common/Communication/EventArgs/DataReceivedEventArgs.cs
index 533b034..bff6c57 100644
--- a/OBD.NET/OBD.NET.Common/Communication/EventArgs/DataReceivedEventArgs.cs
+++ b/OBD.NET/OBD.NET.Common/Communication/EventArgs/DataReceivedEventArgs.cs
@@ -1,21 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OBD.NET.Common.Communication.EventArgs
+namespace OBD.NET.Common.Communication.EventArgs
 {
     /// <summary>
-    /// Event args on receiving serial data
+    /// Event args for receiving serial data
     /// </summary>
     public class DataReceivedEventArgs:System.EventArgs
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataReceivedEventArgs"/> class.
+        /// </summary>
+        /// <param name="count">The count.</param>
+        /// <param name="data">The data.</param>
         public DataReceivedEventArgs(int count, byte[] data)
         {
             Count = count;
             Data = data;
         }
 
+        /// <summary>
+        /// Count of valid data bytes in the buffer
+        /// </summary>
         public int Count { get; private set; }
+
+        /// <summary>
+        /// Data buffer holding the bytes
+        /// </summary>
         public byte[] Data { get; private set; }
     }
 }
diff --git a/OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs b/OBD.NET/OBD.NET.Common/Communication/ISerialConnection.cs
similarity index 89%
rename from OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs
rename to OBD.NET/OBD.NET.Common/Communication/ISerialConnection.cs
index 00b84d8..6b2ea8e 100644
--- a/OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs
+++ b/OBD.NET/OBD.NET.Common/Communication/ISerialConnection.cs
@@ -1,7 +1,5 @@
 using OBD.NET.Common.Communication.EventArgs;
 using System;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace OBD.NET.Communication
@@ -23,9 +21,10 @@ namespace OBD.NET.Communication
         /// <summary>
         /// Gets a value indicating whether this instance uses asynchronous IO
         /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is asynchronous; otherwise, <c>false</c>.
-        /// </value>
+        /// <remarks>
+        /// Has to be set to true if asynchronous IO is supported. 
+        /// If true async methods have to be implemented
+        /// </remarks>
         bool IsAsync { get; }
 
         /// <summary>
@@ -43,8 +42,7 @@ namespace OBD.NET.Communication
         /// </summary>
         /// <returns></returns>
         Task ConnectAsync();
-
-
+        
         /// <summary>
         /// Writes the specified data to the serial connection
         /// </summary>
diff --git a/OBD.NET/OBD.NET.Common/Devices/ELM327.cs b/OBD.NET/OBD.NET.Common/Devices/ELM327.cs
index 2fe0f18..b08d6ac 100644
--- a/OBD.NET/OBD.NET.Common/Devices/ELM327.cs
+++ b/OBD.NET/OBD.NET.Common/Devices/ELM327.cs
@@ -45,12 +45,22 @@ namespace OBD.NET.Devices
 
         #region Methods
 
+        public override async Task InitializeAsync()
+        {
+            await base.InitializeAsync();
+            InternalInitialize();
+        }
+
         public override void Initialize()
         {
             base.Initialize();
+            InternalInitialize();
+        }
 
+        private void InternalInitialize()
+        {
             Logger?.WriteLine("Initializing ...", OBDLogLevel.Debug);
-            
+
             try
             {
                 Logger?.WriteLine("Resetting Device ...", OBDLogLevel.Debug);
@@ -58,7 +68,7 @@ namespace OBD.NET.Devices
 
                 Logger?.WriteLine("Turning Echo Off ...", OBDLogLevel.Debug);
                 SendCommand(ATCommand.EchoOff);
-                
+
                 Logger?.WriteLine("Turning Linefeeds Off ...", OBDLogLevel.Debug);
                 SendCommand(ATCommand.LinefeedsOff);
 
diff --git a/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs b/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
index 620c01d..1d2f2f9 100644
--- a/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
+++ b/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
@@ -22,6 +22,7 @@ namespace OBD.NET.Devices
         private readonly AutoResetEvent commandFinishedEvent = new AutoResetEvent(false);
 
         private Task commandWorkerTask;
+
         private CancellationTokenSource commandCancellationToken;
         
         /// <summary>
@@ -38,15 +39,24 @@ namespace OBD.NET.Devices
         /// Terminator of the protocol message
         /// </summary>
         protected char Terminator { get; set; }
-                
-        
+
+
         #region Constructors
 
+        /// <summary>
+        /// Prevents a default instance of the <see cref="SerialDevice"/> class from being created.
+        /// </summary>
         private SerialDevice()
         {
             commandQueue = new BlockingCollection<string>();
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SerialDevice"/> class.
+        /// </summary>
+        /// <param name="connection">connection.</param>
+        /// <param name="terminator">terminator used for terminating the command message</param>
+        /// <param name="logger">logger instance</param>
         protected SerialDevice(ISerialConnection connection, char terminator = '\r', IOBDLogger logger = null)
             :this()
         {
@@ -66,19 +76,25 @@ namespace OBD.NET.Devices
         /// <summary>
         /// Initializes the device
         /// </summary>
-        public virtual async void Initialize()
+        public virtual void Initialize()
         {
-            if (Connection.IsAsync)
-            {
-                await Connection.ConnectAsync();
-            }
-            else
-            {
-                Connection.Connect();
-            }
+            Connection.Connect();
             CheckConnectionAndStartWorker();
         }
 
+        /// <summary>
+        /// Initializes the device
+        /// </summary>
+        public virtual async Task InitializeAsync()
+        {
+            await Connection.ConnectAsync();
+            CheckConnectionAndStartWorker();
+        }
+
+        /// <summary>
+        /// Checks the connection and starts background worker which is sending the commands
+        /// </summary>
+        /// <exception cref="SerialException">Failed to open Serial-Connection.</exception>
         private void CheckConnectionAndStartWorker()
         {
             if (!Connection.IsOpen)
@@ -95,29 +111,12 @@ namespace OBD.NET.Devices
             commandWorkerTask = Task.Factory.StartNew(CommandWorker);
         }
 
-        private async void CommandWorker()
-        {
-            while (!commandCancellationToken.IsCancellationRequested)
-            {
-                string command = null;
-                commandQueue.TryTake(out command, Timeout.Infinite, commandCancellationToken.Token);
-                Logger?.WriteLine("Writing Command: '" + command.Replace('\r', '\'') + "'", OBDLogLevel.Verbose);
-
-                if (Connection.IsAsync)
-                {
-                    await Connection.WriteAsync(Encoding.ASCII.GetBytes(command));
-                }
-                else
-                {
-                    Connection.Write(Encoding.ASCII.GetBytes(command));
-
-                }
-                //wait for command to finish
-                commandFinishedEvent.WaitOne();
-                
-            }
-        }
 
+        /// <summary>
+        /// Sends the command.
+        /// </summary>
+        /// <param name="command">command string</param>
+        /// <exception cref="System.InvalidOperationException">Not connected</exception>
         protected virtual void SendCommand(string command)
         {
             if (!Connection.IsOpen)
@@ -145,6 +144,11 @@ namespace OBD.NET.Devices
             return command;
         }
 
+        /// <summary>
+        /// Called when data is received from the serial device
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="DataReceivedEventArgs"/> instance containing the event data.</param>
         private void OnDataReceived(object sender, DataReceivedEventArgs e)
         {
             for (int i = 0; i < e.Count; i++)
@@ -171,6 +175,9 @@ namespace OBD.NET.Devices
             }
         }
 
+        /// <summary>
+        /// Signals a final message
+        /// </summary>
         private void FinishLine()
         {
             string line = _lineBuffer.ToString().Trim();
@@ -182,11 +189,45 @@ namespace OBD.NET.Devices
             ProcessMessage(line);
         }
 
-        
+        /// <summary>
+        /// Processes the message.
+        /// </summary>
+        /// <param name="message">message received</param>
         protected abstract void ProcessMessage(string message);
-        
+
+        /// <summary>
+        /// Worker method for sending commands
+        /// </summary>
+        private async void CommandWorker()
+        {
+            while (!commandCancellationToken.IsCancellationRequested)
+            {
+                string command = null;
+                commandQueue.TryTake(out command, Timeout.Infinite, commandCancellationToken.Token);
+                Logger?.WriteLine("Writing Command: '" + command.Replace('\r', '\'') + "'", OBDLogLevel.Verbose);
+
+                if (Connection.IsAsync)
+                {
+                    await Connection.WriteAsync(Encoding.ASCII.GetBytes(command));
+                }
+                else
+                {
+                    Connection.Write(Encoding.ASCII.GetBytes(command));
+
+                }
+                //wait for command to finish
+                commandFinishedEvent.WaitOne();
+
+            }
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
         public virtual void Dispose()
         {
+            commandCancellationToken?.Cancel();
+            commandWorkerTask?.Wait();
             Connection?.Dispose();
         }
 
diff --git a/OBD.NET/OBD.NET.Common/Logging/TraceLogger.cs b/OBD.NET/OBD.NET.Common/Logging/OBDDebugLogger.cs
similarity index 85%
rename from OBD.NET/OBD.NET.Common/Logging/TraceLogger.cs
rename to OBD.NET/OBD.NET.Common/Logging/OBDDebugLogger.cs
index 7ee9adf..949c490 100644
--- a/OBD.NET/OBD.NET.Common/Logging/TraceLogger.cs
+++ b/OBD.NET/OBD.NET.Common/Logging/OBDDebugLogger.cs
@@ -1,8 +1,5 @@
 using OBD.NET.Logging;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 
 namespace OBD.NET.Common.Logging
 {
diff --git a/OBD.NET/OBD.NET.Universal/Communication/BluetoothSerialConnection.cs b/OBD.NET/OBD.NET.Universal/Communication/BluetoothSerialConnection.cs
index 164c5d4..f4d1352 100644
--- a/OBD.NET/OBD.NET.Universal/Communication/BluetoothSerialConnection.cs
+++ b/OBD.NET/OBD.NET.Universal/Communication/BluetoothSerialConnection.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using OBD.NET.Common.Communication.EventArgs;
@@ -10,6 +9,10 @@ using Windows.Storage.Streams;
 
 namespace OBD.NET.Communication
 {
+    /// <summary>
+    /// Bluetooth OBD serial implementation
+    /// </summary>
+    /// <seealso cref="OBD.NET.Communication.ISerialConnection" />
     public class BluetoothSerialConnection : ISerialConnection
     {
 
@@ -20,15 +23,43 @@ namespace OBD.NET.Communication
         
         private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private Task _readerTask;
-        
+
+        private string device;
+
         /// <summary>
-        /// Gets a value indicating whether this connection is open.
+        /// Initializes a new instance of the <see cref="BluetoothSerialConnection"/> class.
+        /// </summary>
+        public BluetoothSerialConnection()
+        {
+            device = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BluetoothSerialConnection"/> class.
+        /// </summary>
+        /// <param name="deviceName">Name of the device.</param>
+        /// <param name="logger">The logger.</param>
+        public BluetoothSerialConnection(string deviceName)
+        {
+            device = deviceName;
+        }
+
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is open.
         /// </summary>
         /// <value>
-        /// <c>true</c> if this connection is open; otherwise, <c>false</c>.
+        /// <c>true</c> if this instance is open; otherwise, <c>false</c>.
         /// </value>
         public bool IsOpen { get; private set; }
 
+        /// <summary>
+        /// Gets a value indicating whether this instance uses asynchronous IO
+        /// </summary>
+        /// <remarks>
+        /// Has to be set to true if asynchronous IO is supported.
+        /// If true async methods have to be implemented
+        /// </remarks>
         public bool IsAsync => true;
 
         /// <summary>
@@ -42,7 +73,7 @@ namespace OBD.NET.Communication
         /// <exception cref="System.NotSupportedException">Synchronous operations not supported</exception>
         public void Connect()
         {
-            throw new NotSupportedException("Synchronous operations not supported");
+            throw new NotSupportedException("Synchronous operations not supported on UWP platform");
         }
 
         /// <summary>
@@ -78,7 +109,7 @@ namespace OBD.NET.Communication
         /// <exception cref="System.NotImplementedException">Synchronous operations not supported</exception>
         public void Write(byte[] data)
         {
-            throw new NotImplementedException("Synchronous operations not supported");
+            throw new NotImplementedException("Synchronous operations not supported on UWP platform");
         }
 
         /// <summary>