diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo
index 4b3fdd6..1382570 100644
Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 16ccff2..797bfdd 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -303,11 +303,16 @@ namespace PepperDash.Core
 				ReconnectTimer.Stop();
 				ReconnectTimer = null;
 			}
+
 			KillStream();
-			Client.Disconnect();
-			Client = null;
-			ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY;
-			Debug.Console(1, this, "Disconnected");
+
+            if (Client != null)
+            {
+                Client.Disconnect();
+                Client = null;
+                ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY;
+                Debug.Console(1, this, "Disconnected");
+            }
 		}
 
 		/// <summary>
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index aa6304d..e24278a 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -287,7 +287,8 @@ namespace PepperDash.Core
 			// Check debug level before processing byte array
 			//if (Debug.Level == 2)
 			//    Debug.Console(2, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
-			Client.SendData(bytes, bytes.Length);
+            if(Client != null)
+			    Client.SendData(bytes, bytes.Length);
 		}
 
 		/// <summary>
diff --git a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs
index da9b8e7..122578d 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs	
@@ -8,6 +8,6 @@ namespace PepperDash.Core
 {
     public enum eControlMethod
     {
-        None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet
+        None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet, Cresnet
     }
 }
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/DeviceConfig.cs b/Pepperdash Core/Pepperdash Core/DeviceConfig.cs
deleted file mode 100644
index 4815533..0000000
--- a/Pepperdash Core/Pepperdash Core/DeviceConfig.cs	
+++ /dev/null
@@ -1,59 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Newtonsoft.Json;
-//using Newtonsoft.Json.Linq;
-
-//namespace PepperDash.Core
-//{
-//    public class DeviceConfig
-//    {
-//        [JsonProperty("key")]
-//        public string Key { get; set; }
-
-//        [JsonProperty("name")]
-//        public string Name { get; set; }
-
-//        [JsonProperty("group")]
-//        public string Group { get; set; }
-
-//        [JsonProperty("type")]
-//        public string Type { get; set; }
-
-//        [JsonProperty("properties")]
-//        [JsonConverter(typeof(DevicePropertiesConverter))]
-//        public JToken Properties { get; set; }
-//    }
-
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public class DevicePropertiesConverter : JsonConverter
-//    {
-
-//        public override bool CanConvert(Type objectType)
-//        {
-//            return objectType == typeof(JToken);
-//        }
-
-//        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-//        {
-//            return JToken.ReadFrom(reader);
-//        }
-
-//        public override bool CanWrite
-//        {
-//            get
-//            {
-//                return false;
-//            }
-//        }
-
-//        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-//        {
-//            throw new NotImplementedException("SOD OFF HOSER");
-//        }
-//    }
-//}
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
index 431bbcb..ffa77ab 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
@@ -79,7 +79,6 @@
     <Compile Include="Logging\DebugContext.cs" />
     <Compile Include="Logging\DebugMemory.cs" />
     <Compile Include="Device.cs" />
-    <Compile Include="DeviceConfig.cs" />
     <Compile Include="Comm\GenericTcpIpServer.cs" />
     <Compile Include="EthernetHelper.cs" />
     <Compile Include="Comm\GenericTcpIpClient.cs" />
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo
index 5a20b25..bf30103 100644
Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ
diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
index b23d9ad..010930c 100644
--- a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
+++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs	
@@ -4,4 +4,4 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Pepperdash_Core")]
 [assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
-[assembly: AssemblyVersion("1.0.1.*")]
+[assembly: AssemblyVersion("1.0.3.*")]