diff --git a/P2PLauncher/View/MainLauncherWindow.xaml b/P2PLauncher/View/MainLauncherWindow.xaml
index 98742dc..2db1675 100644
--- a/P2PLauncher/View/MainLauncherWindow.xaml
+++ b/P2PLauncher/View/MainLauncherWindow.xaml
@@ -30,6 +30,7 @@
                 <!-- Public address-->
                 <Label Content="Public address to use:" HorizontalAlignment="Left" Margin="0,77,0,0" VerticalAlignment="Top"/>
                 <Label x:Name="LabelPublicAddress" Content="0.0.0.0" HorizontalAlignment="Left" Margin="125,77,0,0" VerticalAlignment="Top" Width="85"/>
+                <Button x:Name="ButtonCopyPublicAddress" Click="OnCopyPublicAddressClick" Content="Copy" HorizontalAlignment="Left" Margin="284,80,0,0" VerticalAlignment="Top" Width="75"/>
 
                 <!-- FreeLan address-->
                 <Label Content="Your FreeLAN address to use:" HorizontalAlignment="Left" Margin="0,103,0,0" VerticalAlignment="Top"/>
diff --git a/P2PLauncher/View/MainLauncherWindow.xaml.cs b/P2PLauncher/View/MainLauncherWindow.xaml.cs
index 069fcd6..78c6947 100644
--- a/P2PLauncher/View/MainLauncherWindow.xaml.cs
+++ b/P2PLauncher/View/MainLauncherWindow.xaml.cs
@@ -187,6 +187,10 @@ private void OnOpenServicesSettingsButton(object sender, RoutedEventArgs e)
             window.ShowDialog();
             UpdateWindow();
         }
+        private void OnCopyPublicAddressClick(object sender, RoutedEventArgs e)
+        {
+            Clipboard.SetText(LabelPublicAddress.Content.ToString());
+        }
 
         #endregion
 
@@ -216,6 +220,7 @@ private void OnHubStartClick(object sender, RoutedEventArgs e)
                 freeLanService.SetMode(FreeLanMode.CLIENT_HUB);
                 freeLanService.SetPassphrase(TextBoxHubPassword.Text);
                 freeLanService.SetHostIp(TextBoxHubHost.Text);
+                freeLanService.SetShowShell(CheckBoxDebug.IsChecked.Value);
 
                 OnCommonStart();