diff --git a/SabreTools.Helper/Data/Globals.cs b/SabreTools.Helper/Data/Globals.cs
index a0a34853..b0a8f1b7 100644
--- a/SabreTools.Helper/Data/Globals.cs
+++ b/SabreTools.Helper/Data/Globals.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 #if MONO
@@ -15,9 +16,9 @@ namespace SabreTools.Helper.Data
 
 		private static Logger _logger = null;
 		private static int _maxDegreeOfParallelism = 4;
-		private static string _exeDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase)
-			.Replace("file:", "")
-			.TrimStart('\\');
+		private static string _exeName = new Uri(Assembly.GetExecutingAssembly().GetName().CodeBase).LocalPath;
+		private static string _exeDir = Path.GetDirectoryName(_exeName);
+		private static string _args = string.Join(" ", Environment.GetCommandLineArgs());
 
 		#endregion
 
@@ -49,6 +50,13 @@ namespace SabreTools.Helper.Data
 				};
 			}
 		}
+		public static string ExeName
+		{
+			get
+			{
+				return _exeName;
+			}
+		}
 		public static string ExeDir
 		{
 			get
@@ -56,6 +64,13 @@ namespace SabreTools.Helper.Data
 				return _exeDir;
 			}
 		}
+		public static string CommandLineArgs
+		{
+			get
+			{
+				return _args;
+			}
+		}
 
 		#endregion
 	}
diff --git a/SabreTools.Helper/Logger.cs b/SabreTools.Helper/Logger.cs
index 59f29041..64878f6b 100644
--- a/SabreTools.Helper/Logger.cs
+++ b/SabreTools.Helper/Logger.cs
@@ -88,7 +88,7 @@ namespace SabreTools.Helper
 				_log.AutoFlush = true;
 
 				_log.WriteLine("Logging started " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-				_log.WriteLine(Environment.CommandLine);
+				_log.WriteLine(string.Format("Command run: {0}", Globals.CommandLineArgs));
 			}
 			catch
 			{