diff --git a/MndpTray/MndpService/Program.cs b/MndpTray/MndpService/Program.cs
index 2b1eeeb..989e260 100644
--- a/MndpTray/MndpService/Program.cs
+++ b/MndpTray/MndpService/Program.cs
@@ -5,9 +5,9 @@
 
 namespace MndpService
 {
-    internal static class Program
+    public static class Program
     {
-        private static void Main(string[] args)
+        public static void Main(string[] args)
         {
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
@@ -30,7 +30,7 @@ private static void Main(string[] args)
         
         private static readonly object LOG_FILE_LOCK = new object();
         private static readonly string LOG_FILE_NAME = GetLogFileName("log");
-        private static readonly bool LOG_FILE_IS_ENABLED = File.Exists(LOG_FILE_NAME);
+        private static readonly bool LOG_FILE_IS_ENABLED = File.Exists(GetLogFileName("log"));
 
         #endregion Fields
 
diff --git a/MndpTray/MndpService/Properties/AssemblyInfo.cs b/MndpTray/MndpService/Properties/AssemblyInfo.cs
index 0e87bd2..660c75f 100644
--- a/MndpTray/MndpService/Properties/AssemblyInfo.cs
+++ b/MndpTray/MndpService/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/MndpTray/MndpTray.Protocol.Test/Program.cs b/MndpTray/MndpTray.Protocol.Test/Program.cs
index fda9b46..4e79a46 100644
--- a/MndpTray/MndpTray.Protocol.Test/Program.cs
+++ b/MndpTray/MndpTray.Protocol.Test/Program.cs
@@ -3,31 +3,29 @@
 
 namespace MndpTray.Protocol.Test
 {
-    
-        internal class Program
-        {
-            private static readonly Timer Timer = new Timer(Timer_Callback, null, Timeout.Infinite, Timeout.Infinite);
+    public class Program
+    {
+        private static readonly Timer Timer = new Timer(Timer_Callback, null, Timeout.Infinite, Timeout.Infinite);
 
-            private static void Timer_Callback(object state)
-            {
-                foreach (var i in MndpListener.Instance.GetMessages()) Console.WriteLine(i.Value.ToString());
-                Console.WriteLine("--- Message List End ---");
-            }
+        public static void Main(string[] args)
+        {
+            MndpListener.Instance.Start();
+            MndpSender.Instance.Start(MndpHostInfo.Instance);
+            Timer.Change(0, 5000);
 
-            private static void Main(string[] args)
-            {
-                MndpListener.Instance.Start();
-                MndpSender.Instance.Start(MndpHostInfo.Instance);
-                Timer.Change(0, 5000);
+            Console.WriteLine("--- Start ---");
+            while (!Console.KeyAvailable) { Thread.Sleep(100); }
+            Console.WriteLine("--- Stop ---");
 
-                Console.WriteLine("--- Start ---");
-                while (!Console.KeyAvailable) { Thread.Sleep(100); }
-                Console.WriteLine("--- Stop ---");
+            Timer.Change(Timeout.Infinite, Timeout.Infinite);
+            MndpListener.Instance.Stop();
+            MndpSender.Instance.Stop();
+        }
 
-                Timer.Change(Timeout.Infinite, Timeout.Infinite);
-                MndpListener.Instance.Stop();
-                MndpSender.Instance.Stop();
-            }
+        private static void Timer_Callback(object state)
+        {
+            foreach (var i in MndpListener.Instance.GetMessages()) Console.WriteLine(i.Value.ToString());
+            Console.WriteLine("--- Message List End ---");
         }
-    
-}
+    }
+}
\ No newline at end of file
diff --git a/MndpTray/MndpTray.Protocol.Test/Properties/AssemblyInfo.cs b/MndpTray/MndpTray.Protocol.Test/Properties/AssemblyInfo.cs
index 33fa5a8..b704d14 100644
--- a/MndpTray/MndpTray.Protocol.Test/Properties/AssemblyInfo.cs
+++ b/MndpTray/MndpTray.Protocol.Test/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyTitle("MndpTray.Protocol.Test")]
 [assembly: AssemblyDescription("MndpTray.Protocol Package Test Application")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Pádár Tamás")]
 [assembly: AssemblyProduct("MndpTray.Protocol.Test")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
@@ -32,5 +32,5 @@
 // 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.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/MndpTray/MndpTray.Protocol.Test/packages.config b/MndpTray/MndpTray.Protocol.Test/packages.config
index eb217a0..b12415e 100644
--- a/MndpTray/MndpTray.Protocol.Test/packages.config
+++ b/MndpTray/MndpTray.Protocol.Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MndpTray.Protocol" version="1.5.0" targetFramework="net461" />
+  <package id="MndpTray.Protocol" version="1.5.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/MndpTray/MndpTray.Protocol/IMndpInterfaceInfo.cs b/MndpTray/MndpTray.Protocol/IMndpInterfaceInfo.cs
index 07fc40d..58aa33d 100644
--- a/MndpTray/MndpTray.Protocol/IMndpInterfaceInfo.cs
+++ b/MndpTray/MndpTray.Protocol/IMndpInterfaceInfo.cs
@@ -27,5 +27,11 @@ public interface IMndpInterfaceInfo
         /// </summary>
         /// <example>192.168.0.1</example>
         string UnicastAddress { get; }
+
+        /// <summary>
+        /// Interface Ipv6 unicast address
+        /// </summary>
+        /// <example>fe80::2d1f:d9f4:4c05:a200</example>
+        string UnicastIPv6Address { get; }
     }
 }
\ No newline at end of file
diff --git a/MndpTray/MndpTray.Protocol/MndpHostInfo.cs b/MndpTray/MndpTray.Protocol/MndpHostInfo.cs
index 30e2cf6..31b868b 100644
--- a/MndpTray/MndpTray.Protocol/MndpHostInfo.cs
+++ b/MndpTray/MndpTray.Protocol/MndpHostInfo.cs
@@ -71,7 +71,9 @@ public List<IMndpInterfaceInfo> InterfaceInfos
                                                   .ToList();
 
                         foreach (var @interface in interfaces)
-                            foreach (var unicastAddress in @interface.GetIPProperties().UnicastAddresses)
+                        {
+                            var addresses = @interface.GetIPProperties().UnicastAddresses;
+                            foreach (var unicastAddress in addresses)
                             {
                                 if (unicastAddress.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork && unicastAddress.IPv4Mask != null)
                                 {
@@ -79,10 +81,13 @@ public List<IMndpInterfaceInfo> InterfaceInfos
                                     var maskInt = BitConverter.ToInt32(unicastAddress.IPv4Mask.GetAddressBytes(), 0);
                                     var broadcastInt = addressInt | ~maskInt;
                                     var broadcast = new IPAddress(BitConverter.GetBytes(broadcastInt));
+                                    var ipv6Address = addresses.Where(a => a.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6).FirstOrDefault()?.Address;
+
 
-                                    ret.Add(new MndpInterfaceInfo(broadcast.ToString(), @interface.Name, @interface.GetPhysicalAddress().ToString(), unicastAddress.Address.ToString()));
+                                    ret.Add(new MndpInterfaceInfo(broadcast.ToString(), @interface.Name, @interface.GetPhysicalAddress().ToString(), unicastAddress.Address.ToString(), ipv6Address?.ToString()));
                                 }
                             }
+                        }
                     }
                     catch (Exception ex)
                     {
diff --git a/MndpTray/MndpTray.Protocol/MndpInterfaceInfo.cs b/MndpTray/MndpTray.Protocol/MndpInterfaceInfo.cs
index d05f31f..4ce23bf 100644
--- a/MndpTray/MndpTray.Protocol/MndpInterfaceInfo.cs
+++ b/MndpTray/MndpTray.Protocol/MndpInterfaceInfo.cs
@@ -32,6 +32,12 @@ public class MndpInterfaceInfo : IMndpInterfaceInfo
         /// <example>192.168.0.1</example>
         public String UnicastAddress { get; }
 
+        /// <summary>
+        /// Interface Ipv6 unicast address
+        /// </summary>
+        /// <example>fe80::2d1f:d9f4:4c05:a200</example>
+        public String UnicastIPv6Address { get; }
+
         #endregion Props
 
         #region Methods
@@ -43,12 +49,14 @@ public class MndpInterfaceInfo : IMndpInterfaceInfo
         /// <param name="interfaceName">Interface name</param>
         /// <param name="macAddress">Interface mac address 12 hexdigit</param>
         /// <param name="unicastAddress">Interface unicast address</param>
-        public MndpInterfaceInfo(string broadcastAddress, string interfaceName, string macAddress, string unicastAddress)
+        /// <param name="unicastIpv6Address">Interface Ipv6 unicast address</param>
+        public MndpInterfaceInfo(string broadcastAddress, string interfaceName, string macAddress, string unicastAddress, string unicastIpv6Address)
         {
             this.BroadcastAddress = broadcastAddress;
             this.InterfaceName = interfaceName;
             this.MacAddress = macAddress;
             this.UnicastAddress = unicastAddress;
+            this.UnicastIPv6Address = unicastIpv6Address;
         }
 
         #endregion Methods
diff --git a/MndpTray/MndpTray.Protocol/MndpMessage.cs b/MndpTray/MndpTray.Protocol/MndpMessage.cs
index 8524811..bad2a49 100644
--- a/MndpTray/MndpTray.Protocol/MndpMessage.cs
+++ b/MndpTray/MndpTray.Protocol/MndpMessage.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Net.NetworkInformation;
 using System.Text;
 
@@ -16,6 +17,7 @@ public class MndpMessage
         private const ushort TLV_TYPE_BOARD_NAME = 12;
         private const ushort TLV_TYPE_IDENTITY = 5;
         private const ushort TLV_TYPE_INTERFACE_NAME = 16;
+        private const ushort TLV_TYPE_IPV6 = 15;
         private const ushort TLV_TYPE_MAC_ADDRESS = 1;
         private const ushort TLV_TYPE_PLATFORM = 8;
         private const ushort TLV_TYPE_SOFTWAREID = 11;
@@ -26,6 +28,7 @@ public class MndpMessage
         #endregion Consts
 
         #region Props
+
         /// <summary>
         /// Sender board name
         /// </summary>
@@ -41,6 +44,11 @@ public class MndpMessage
         /// </summary>
         public string InterfaceName { get; set; }
 
+        /// <summary>
+        /// Sender unicast IPv6 address
+        /// </summary>
+        public string UnicastIPv6Address { get; set; }
+
         /// <summary>
         /// Sender mac address
         /// </summary>
@@ -82,7 +90,7 @@ public class MndpMessage
         public TimeSpan Uptime { get; set; }
 
         /// <summary>
-        /// Sender software version 
+        /// Sender software version
         /// </summary>
         public string Version { get; set; }
 
@@ -150,11 +158,15 @@ public bool Read(byte[] data)
                             this.InterfaceName = enc.GetString(i.Value);
                             break;
 
+                        case TLV_TYPE_IPV6:
+                            this.UnicastIPv6Address = new IPAddress(i.Value).ToString();
+                            break;
+
                         default: break;
                     }
                 }
 
-                Log.Info("{0} Read,{2}{1}{2}",nameof(MndpMessage), this.ToString(), Environment.NewLine);
+                Log.Info("{0} Read,{2}{1}{2}", nameof(MndpMessage), this.ToString(), Environment.NewLine);
 
                 return true;
             }
@@ -186,6 +198,7 @@ public override string ToString()
             sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.BoardName), this.BoardName);
             sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.Unpack), this.Unpack);
             sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.InterfaceName), this.InterfaceName);
+            sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.UnicastIPv6Address), this.UnicastIPv6Address);
 
             return sb.ToString();
         }
@@ -198,7 +211,7 @@ public byte[] Write()
         {
             try
             {
-                Log.Info("{0} Write,{2}{1}{2}", nameof(MndpMessage), this.ToString(),Environment.NewLine);
+                Log.Info("{0} Write,{2}{1}{2}", nameof(MndpMessage), this.ToString(), Environment.NewLine);
 
                 var tlvMessage = new TlvMessage()
                 {
@@ -249,6 +262,11 @@ public byte[] Write()
                             tlvMessage.Items.Add(new Tlv(i, this.InterfaceName, enc));
                             break;
 
+                        case TLV_TYPE_IPV6:
+                            if (this.UnicastIPv6Address != null)
+                                tlvMessage.Items.Add(new Tlv(i, IPAddress.Parse(this.UnicastIPv6Address).GetAddressBytes()));
+                            break;
+
                         default: break;
                     }
                 }
@@ -285,7 +303,7 @@ protected class Tlv
             /// Record length
             /// </summary>
             public ushort Length { get; set; }
-        
+
             /// <summary>
             /// Record vlue
             /// </summary>
@@ -589,7 +607,7 @@ public class MndpMessageEx : MndpMessage, ICloneable
         public DateTime ReceiveDateTime { get; set; }
 
         /// <summary>
-        /// Sender unicast IPv4 address 
+        /// Sender unicast IPv4 address
         /// </summary>
         public string UnicastAddress { get; set; }
 
@@ -599,13 +617,14 @@ public class MndpMessageEx : MndpMessage, ICloneable
         /// <example>
         /// AA:BB:CC:DD:EE:FF
         /// </example>
-        public string MacAddressDelimited {
+        public string MacAddressDelimited
+        {
             get
             {
                 if (this.MacAddress == null) return null;
                 StringBuilder sb = new StringBuilder();
-                                
-                for(int i=0;i<this.MacAddress.Length;i++)
+
+                for (int i = 0; i < this.MacAddress.Length; i++)
                 {
                     sb.Append(this.MacAddress[i]);
                     if (i % 2 == 1) sb.Append(':');
@@ -613,8 +632,9 @@ public string MacAddressDelimited {
 
                 if (sb.Length > 0) sb.Remove(sb.Length - 1, 1);
                 return sb.ToString();
+            }
+        }
 
-            } }
         #endregion Props
 
         #region Methods
@@ -637,8 +657,8 @@ public override string ToString()
             var sb = new StringBuilder();
 
             sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.ReceiveDateTime), this.ReceiveDateTime);
-            sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.UnicastAddress),  this.UnicastAddress);
-            sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.BroadcastAddress),this.BroadcastAddress);
+            sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.UnicastAddress), this.UnicastAddress);
+            sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.BroadcastAddress), this.BroadcastAddress);
             sb.Append(base.ToString());
 
             return sb.ToString();
diff --git a/MndpTray/MndpTray.Protocol/MndpSender.cs b/MndpTray/MndpTray.Protocol/MndpSender.cs
index 0388be8..6a67092 100644
--- a/MndpTray/MndpTray.Protocol/MndpSender.cs
+++ b/MndpTray/MndpTray.Protocol/MndpSender.cs
@@ -195,6 +195,7 @@ private void _sendHostInfoWork()
                             msg.InterfaceName = i.InterfaceName;
                             msg.MacAddress = i.MacAddress;
                             msg.UnicastAddress = i.UnicastAddress;
+                            msg.UnicastIPv6Address = i.UnicastIPv6Address;
 
                             this.Send((MndpMessageEx)msg.Clone());
                         }
diff --git a/MndpTray/MndpTray.Protocol/Properties/AssemblyInfo.cs b/MndpTray/MndpTray.Protocol/Properties/AssemblyInfo.cs
index 255e5bf..b3b6034 100644
Binary files a/MndpTray/MndpTray.Protocol/Properties/AssemblyInfo.cs and b/MndpTray/MndpTray.Protocol/Properties/AssemblyInfo.cs differ
diff --git a/MndpTray/MndpTray.Protocol/package.nuspec b/MndpTray/MndpTray.Protocol/package.nuspec
index d361dc0..9b7b2d2 100644
--- a/MndpTray/MndpTray.Protocol/package.nuspec
+++ b/MndpTray/MndpTray.Protocol/package.nuspec
@@ -14,12 +14,12 @@
     <iconUrl>https://raw.githubusercontent.com/xmegz/MndpTray/master/MndpTray/MndpTray/Images/favicon.ico</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--*-->
-    <description>Mikrotik Neighbor Discovery Protocol</description>
+    <description>Mikrotik Neighbor Discovery Protocol - Network Discovery</description>
     <!--*-->
     <repository type="git" url="https://github.com/xmegz/MndpTray" />
     <releaseNotes>IMndpHostInfo InterfaceInfo also interface</releaseNotes>
     <copyright>Copyright ©  2018</copyright>
-    <tags>Mikrotik Discovery Protocol</tags>
+    <tags>Mikrotik Discovery Protocol Network Udp Broadcast Windows Routeros Mndp</tags>
     <dependencies>
       <!--
       <dependency id="SampleDependency" version="1.0" />
diff --git a/MndpTray/MndpTray/Program.cs b/MndpTray/MndpTray/Program.cs
index fa7e8c2..5ed8909 100644
--- a/MndpTray/MndpTray/Program.cs
+++ b/MndpTray/MndpTray/Program.cs
@@ -5,10 +5,10 @@
 
 namespace MndpTray
 {
-    internal static class Program
+    public static class Program
     {
         [STAThread]
-        private static void Main()
+        public static void Main()
         {
             string processName = System.Diagnostics.Process.GetCurrentProcess().ProcessName;
             if (System.Diagnostics.Process.GetProcessesByName(processName).Length > 1)
@@ -24,10 +24,11 @@ private static void Main()
             Log("-------------------< END >-------------------");
         }
 
-        #region Fields        
+        #region Fields
+
+        private static readonly bool LOG_FILE_IS_ENABLED = File.Exists(GetLogFileName("log"));
         private static readonly object LOG_FILE_LOCK = new object();
         private static readonly string LOG_FILE_NAME = GetLogFileName("log");
-        private static readonly bool LOG_FILE_IS_ENABLED = File.Exists(LOG_FILE_NAME);
         #endregion Fields
 
         #region Event Handlers
diff --git a/MndpTray/MndpTray/Properties/AssemblyInfo.cs b/MndpTray/MndpTray/Properties/AssemblyInfo.cs
index 7ad99dc..e50cd49 100644
--- a/MndpTray/MndpTray/Properties/AssemblyInfo.cs
+++ b/MndpTray/MndpTray/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/MndpTray/MndpTray/Visual/ListForm.Designer.cs b/MndpTray/MndpTray/Visual/ListForm.Designer.cs
index 885b8d3..4f3ae99 100644
--- a/MndpTray/MndpTray/Visual/ListForm.Designer.cs
+++ b/MndpTray/MndpTray/Visual/ListForm.Designer.cs
@@ -44,6 +44,7 @@ private void InitializeComponent()
             this.SoftwareId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Age = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Uptime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IPv6Address = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGrid)).BeginInit();
             this.SuspendLayout();
             // 
@@ -69,7 +70,8 @@ private void InitializeComponent()
             this.InterfaceName,
             this.SoftwareId,
             this.Age,
-            this.Uptime});
+            this.Uptime,
+            this.IPv6Address});
             this.dgvGrid.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGrid.Location = new System.Drawing.Point(0, 0);
             this.dgvGrid.Name = "dgvGrid";
@@ -142,12 +144,19 @@ private void InitializeComponent()
             // 
             // Uptime
             // 
-            this.Uptime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
             this.Uptime.DefaultCellStyle = dataGridViewCellStyle2;
             this.Uptime.HeaderText = "Uptime";
             this.Uptime.Name = "Uptime";
             this.Uptime.ReadOnly = true;
+            this.Uptime.Width = 5;
+            // 
+            // IPv6Address
+            // 
+            this.IPv6Address.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.IPv6Address.HeaderText = "IPv6";
+            this.IPv6Address.Name = "IPv6Address";
+            this.IPv6Address.ReadOnly = true;
             // 
             // ListForm
             // 
@@ -176,5 +185,6 @@ private void InitializeComponent()
         private System.Windows.Forms.DataGridViewTextBoxColumn SoftwareId;
         private System.Windows.Forms.DataGridViewTextBoxColumn Age;
         private System.Windows.Forms.DataGridViewTextBoxColumn Uptime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IPv6Address;
     }
 }
\ No newline at end of file
diff --git a/MndpTray/MndpTray/Visual/ListForm.cs b/MndpTray/MndpTray/Visual/ListForm.cs
index 34ed00a..45e0f47 100644
--- a/MndpTray/MndpTray/Visual/ListForm.cs
+++ b/MndpTray/MndpTray/Visual/ListForm.cs
@@ -19,6 +19,8 @@ public ListForm()
             this.Text = String.Concat(this.Text, " Version: ", Assembly.GetEntryAssembly().GetName().Version.ToString());
         }
 
+        #region Event Handlers
+
         private void DgvGrid_MouseDown(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Right)
@@ -60,20 +62,17 @@ private void DgvGrid_MouseDown(object sender, MouseEventArgs e)
                 vncMenuStrip.Click += this.Vnc_Click;
                 contextMenuStrip.Items.Add(vncMenuStrip);
 
+                var winboxMenuStrip = new ToolStripMenuItem
+                {
+                    Text = "Winbox"
+                };
+                winboxMenuStrip.Click += this.Winbox_Click;
+                contextMenuStrip.Items.Add(winboxMenuStrip);
+
                 contextMenuStrip.Show(this, new Point(e.X, e.Y));
             }
         }
 
-        private string GetSelectedIpAddress()
-        {
-            if (this.dgvGrid.SelectedRows.Count > 0)
-            {
-                return this.dgvGrid.SelectedRows[0].Cells[0].Value as string;
-            }
-
-            return null;
-        }
-
         private void Http_Click(object sender, EventArgs e)
         {
             try
@@ -90,16 +89,7 @@ private void Http_Click(object sender, EventArgs e)
 
         private void Ping_Click(object sender, EventArgs e)
         {
-            try
-            {
-                string ip = this.GetSelectedIpAddress();
-                if (ip == null) return;
-                System.Diagnostics.Process.Start("ping", ip);
-            }
-            catch (Exception ex)
-            {
-                Program.Log("Exception {0}", ex);
-            }
+            this.StartProcessWithIpArgument("ping");
         }
 
         private void Rdp_Click(object sender, EventArgs e)
@@ -116,34 +106,6 @@ private void Rdp_Click(object sender, EventArgs e)
             }
         }
 
-        private void Vnc_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                string ip = this.GetSelectedIpAddress();
-                if (ip == null) return;
-                System.Diagnostics.Process.Start("tvnviewer", ip);
-            }
-            catch (Exception ex)
-            {
-                Program.Log("Exception {0}", ex);
-            }
-        }
-
-        private void Ssh_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                string ip = this.GetSelectedIpAddress();
-                if (ip == null) return;
-                System.Diagnostics.Process.Start("putty", ip);
-            }
-            catch (Exception ex)
-            {
-                Program.Log("Exception {0}", ex);
-            }
-        }
-
         private void Receive_Timer(object sender, EventArgs e)
         {
             try
@@ -165,14 +127,14 @@ private void Receive_Timer(object sender, EventArgs e)
                     if (dictRow.ContainsKey(i.MacAddress))
                     {
                         var row = dictRow[i.MacAddress];
-                        row.SetValues(i.UnicastAddress, i.MacAddressDelimited, i.Identity, i.Platform, i.Version, i.BoardName, i.InterfaceName, i.SoftwareId, i.Age.ToString("F0"), i.Uptime);
+                        row.SetValues(i.UnicastAddress, i.MacAddressDelimited, i.Identity, i.Platform, i.Version, i.BoardName, i.InterfaceName, i.SoftwareId, i.Age.ToString("F0"), i.Uptime, i.UnicastIPv6Address);
                         dictRow.Remove(i.MacAddress);
                     }
                     else
                     {
                         var row = new DataGridViewRow();
 
-                        row.CreateCells(this.dgvGrid, i.UnicastAddress, i.MacAddressDelimited, i.Identity, i.Platform, i.Version, i.BoardName, i.InterfaceName, i.SoftwareId, i.Age.ToString("F0"), i.Uptime);
+                        row.CreateCells(this.dgvGrid, i.UnicastAddress, i.MacAddressDelimited, i.Identity, i.Platform, i.Version, i.BoardName, i.InterfaceName, i.SoftwareId, i.Age.ToString("F0"), i.Uptime, i.UnicastIPv6Address);
                         row.Tag = i.MacAddress;
                         this.dgvGrid.Rows.Add(row);
                     }
@@ -191,6 +153,34 @@ private void Receive_Timer(object sender, EventArgs e)
             }
         }
 
+        private void Ssh_Click(object sender, EventArgs e)
+        {
+            this.StartProcessWithIpArgument("putty");
+        }
+
+        private void Vnc_Click(object sender, EventArgs e)
+        {
+            this.StartProcessWithIpArgument("tvnviewer");
+        }
+
+        private void Winbox_Click(object sender, EventArgs e)
+        {
+            this.StartProcessWithIpArgument("winbox");
+        }
+
+        #endregion Event Handlers
+
+        #region Methods
+
+        private string GetSelectedIpAddress()
+        {
+            if (this.dgvGrid.SelectedRows.Count > 0)
+            {
+                return this.dgvGrid.SelectedRows[0].Cells[0].Value as string;
+            }
+            return null;
+        }
+
         private void SetDoubleBuffering(DataGridView dataGridView, bool value = true)
         {
             Type type = dataGridView.GetType();
@@ -198,5 +188,29 @@ private void SetDoubleBuffering(DataGridView dataGridView, bool value = true)
                     BindingFlags.Instance | BindingFlags.NonPublic);
             pi.SetValue(dataGridView, value, null);
         }
+
+        private void StartProcessWithIpArgument(string name)
+        {
+            try
+            {
+                string ip = this.GetSelectedIpAddress();
+                if (ip == null) return;
+
+                try
+                {
+                    System.Diagnostics.Process.Start(name, ip);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message + ":" + name);
+                }
+            }
+            catch (Exception ex)
+            {
+                Program.Log("Exception {0}", ex);
+            }
+        }
+
+        #endregion Methods
     }
 }
\ No newline at end of file
diff --git a/MndpTray/MndpTray/Visual/ListForm.resx b/MndpTray/MndpTray/Visual/ListForm.resx
index 9497275..9519ecb 100644
--- a/MndpTray/MndpTray/Visual/ListForm.resx
+++ b/MndpTray/MndpTray/Visual/ListForm.resx
@@ -150,6 +150,9 @@
   <metadata name="Uptime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="IPv6Address.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/README.md b/README.md
index e3e45cb..d9b6e3e 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ MNDP Mikrotik Neighbor Discovery Protocol Tray Application
 * Self update from github
 
 ## Screenshots:
-![alt text](https://github.com/xmegz/MndpTray/blob/master/MndpTray/MndpTray/Images/screenshot3.png)
-![alt text](https://github.com/xmegz/MndpTray/blob/master/MndpTray/MndpTray/Images/screenshot2.png)
+![alt text](https://raw.githubusercontent.com/xmegz/MndpTray/master/MndpTray/MndpTray/Images/screenshot3.png)
+![alt text](https://raw.githubusercontent.com/xmegz/MndpTray/master/MndpTray/MndpTray/Images/screenshot2.png)
 
 ## Tested:
 * Windows 10, Windows 7
@@ -32,36 +32,35 @@ MndpService Uninstall - Uninstall Service
 *Install via Nuget: [https://www.nuget.org/packages/MndpTray.Protocol/](https://www.nuget.org/packages/MndpTray.Protocol/)
 ### Usage:
 ```C#
-using MndpTray.Protocol;
 using System;
 using System.Threading;
 
-namespace ConsoleApp2
+namespace MndpTray.Protocol.Test
 {
-    internal class Program
+    public class Program
     {
         private static readonly Timer Timer = new Timer(Timer_Callback, null, Timeout.Infinite, Timeout.Infinite);
 
-        private static void Timer_Callback(object state)
+        public static void Main(string[] args)
         {
-            foreach (var i in MndpListener.Instance.GetMessages()) Console.WriteLine(i.Value.ToString());
-            Console.WriteLine("--- Message List End ---");
-        }
-
-        private static void Main(string[] args)
-        {            
             MndpListener.Instance.Start();
             MndpSender.Instance.Start(MndpHostInfo.Instance);
             Timer.Change(0, 5000);
 
             Console.WriteLine("--- Start ---");
-            while (!Console.KeyAvailable) { Thread.Sleep(100); }           
+            while (!Console.KeyAvailable) { Thread.Sleep(100); }
             Console.WriteLine("--- Stop ---");
 
             Timer.Change(Timeout.Infinite, Timeout.Infinite);
             MndpListener.Instance.Stop();
             MndpSender.Instance.Stop();
         }
+
+        private static void Timer_Callback(object state)
+        {
+            foreach (var i in MndpListener.Instance.GetMessages()) Console.WriteLine(i.Value.ToString());
+            Console.WriteLine("--- Message List End ---");
+        }
     }
 }
 ```