diff --git a/Pepperdash Core/Pepperdash Core/Comm/CommunicationGather.cs b/Pepperdash Core/Pepperdash Core/Comm/CommunicationGather.cs
index f352cd8..4984338 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/CommunicationGather.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/CommunicationGather.cs	
@@ -32,6 +32,12 @@ namespace PepperDash.Core
 		/// </summary>
 		public IBasicCommunication Port { get; private set; }
 
+		/// <summary>
+		/// Default false. If true, the delimiter will be included in the line output
+		/// events
+		/// </summary>
+		public bool IncludeDelimiter { get; set; }
+
 		/// <summary>
 		///	For receive buffer
 		/// </summary>
@@ -92,7 +98,14 @@ namespace PepperDash.Core
 				if (lines.Length > 0)
 				{
 					for (int i = 0; i < lines.Length - 1; i++)
-						handler(this, new GenericCommMethodReceiveTextArgs(lines[i]));
+					{
+						string strToSend = null;
+						if (IncludeDelimiter)
+							strToSend = lines[i] + Delimiter;
+						else
+							strToSend = lines[i];
+						handler(this, new GenericCommMethodReceiveTextArgs(strToSend));
+					}
 					ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);
 				}
 			}
@@ -117,7 +130,14 @@ namespace PepperDash.Core
 				if (lines.Length > 1)
 				{
 					for (int i = 0; i < lines.Length - 1; i++)
-						handler(this, new GenericCommMethodReceiveTextArgs(lines[i]));
+					{
+						string strToSend = null;
+						if (IncludeDelimiter)
+							strToSend = lines[i] + StringDelimiter;
+						else
+							strToSend = lines[i];
+						handler(this, new GenericCommMethodReceiveTextArgs(strToSend));
+					}
 					ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);
 				}
 			}
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index cde5438..8d093a2 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -64,7 +64,7 @@ namespace PepperDash.Core
 		public bool AutoReconnect { get; set; }
 		
 		/// <summary>
-		/// 
+		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
 		/// </summary>
 		public int AutoReconnectIntervalMs { get; set; }
 
@@ -98,6 +98,7 @@ namespace PepperDash.Core
 					return;
 				}
 			}
+			AutoReconnectIntervalMs = 5000;
 
 			Client = new TCPClient(address, port, bufferSize);
 			Client.SocketStatusChange += Client_SocketStatusChange;
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo
index eadee59..1973a08 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/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz
index f609fdf..a9cee3f 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config
index f10d936..b4aa2fb 100644
--- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
+++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
@@ -10,8 +10,8 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>10/18/2016 12:34:49 PM</CompiledOn>
-    <CompilerRev>1.0.0.20775</CompilerRev>
+    <CompiledOn>11/9/2016 5:41:14 PM</CompiledOn>
+    <CompilerRev>1.0.0.31834</CompilerRev>
   </OptionalInfo>
   <Plugin>
     <Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll
index 5d04044..27bb183 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info
index dc1e75a..b91d1bb 100644
--- a/Pepperdash Core/Pepperdash Core/bin/manifest.info	
+++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info	
@@ -1,4 +1,4 @@
-MainAssembly=PepperDash_Core.dll:59ea04ece7016e5dd5cfbefdb88bb5ab
+MainAssembly=PepperDash_Core.dll:5bffbd7a7e3b0acd31ccd19249863216
 MainAssemblyMinFirmwareVersion=1.007.0017
 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
 ü
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser
index 074eeee..946fb92 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ