diff --git a/DanTup.BrowserSelector/BrowserSelector.ini b/DanTup.BrowserSelector/BrowserSelector.ini
index 0f81a25..d70f47a 100644
--- a/DanTup.BrowserSelector/BrowserSelector.ini
+++ b/DanTup.BrowserSelector/BrowserSelector.ini
@@ -1,10 +1,11 @@
 ; Default browser is first in list
-; Micrsoft Edge is a UWP app and requires no path
+; Use `{url}` to specify UWP app browser details
 [browsers]
 chrome = C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
 ff = C:\Program Files (x86)\Mozilla Firefox\firefox.exe
-edge = 
+edge = microsoft-edge:{url}
 ie = iexplore.exe
+chrome_prof8 = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" --profile-directory="Profile 8"
 
 ; Url preferences.
 ; Only * is treated as a special character (wildcard).
@@ -13,3 +14,13 @@ ie = iexplore.exe
 [urls]
 microsoft.com = ie
 *.microsoft.com = ie
+
+; Use my project-based Chrome profile
+myproject.live = chrome_prof8
+myproject.local = chrome_prof8
+
+; if the key is wrapped in /'s, it is treated as a regex.
+/sites\.google\.com/a/myproject.live\.com/ = chrome_prof8
+
+google.com = chrome
+visualstudio.com = edge
\ No newline at end of file
diff --git a/DanTup.BrowserSelector/ConfigReader.cs b/DanTup.BrowserSelector/ConfigReader.cs
index 841d8a1..78adb67 100644
--- a/DanTup.BrowserSelector/ConfigReader.cs
+++ b/DanTup.BrowserSelector/ConfigReader.cs
@@ -3,6 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
 
 namespace DanTup.BrowserSelector
 {
@@ -11,7 +13,7 @@ static class ConfigReader
 		/// <summary>
 		/// Config lives in the same folder as the EXE, name "BrowserSelector.ini".
 		/// </summary>
-		static string ConfigPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "BrowserSelector.ini");
+		public static string ConfigPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "BrowserSelector.ini");
 
 		static internal IEnumerable<UrlPreference> GetUrlPreferences()
 		{
@@ -62,6 +64,58 @@ static KeyValuePair<string, string> SplitConfig(string configLine)
 			var parts = configLine.Split(new[] { '=' }, 2);
 			return new KeyValuePair<string, string>(parts[0].Trim(), parts[1].Trim());
 		}
+
+		public static void CreateSampleIni()
+		{
+			Assembly assembly;
+			Stream stream;
+			StringBuilder result;
+
+			assembly = Assembly.GetExecutingAssembly();
+			//stream = assembly.GetManifestResourceStream("DanTup.BrowserSelector.BrowserSelector.ini");
+			stream = assembly.GetManifestResourceStream(assembly.GetManifestResourceNames()[0]);
+			if (stream == null)
+			{
+				return;
+			}
+
+			result = new StringBuilder();
+
+			using (StreamReader reader = new StreamReader(stream))
+			{
+				result.Append(reader.ReadToEnd());
+				reader.Close();
+			}
+
+			if (result.Length > 0)
+			{
+				if (File.Exists(ConfigPath))
+				{
+					string newName = GetBackupFileName(ConfigPath);
+					File.Move(ConfigPath, newName);
+				}
+
+				File.WriteAllText(ConfigPath, result.ToString());
+			}
+		}
+
+		static string GetBackupFileName(string fileName)
+		{
+			string newName;
+			string fname;
+			string fext;
+			int index = 0;
+
+			fname = Path.GetDirectoryName(fileName) + "\\" + Path.GetFileNameWithoutExtension(fileName);
+			fext = Path.GetExtension(fileName);
+
+			do
+			{
+				newName = string.Format("{0}.{1:0000}{2}", fname, ++index, fext);
+			} while (File.Exists(newName));
+
+			return newName;
+		}
 	}
 
 	class Browser
diff --git a/DanTup.BrowserSelector/DanTup.BrowserSelector.csproj b/DanTup.BrowserSelector/DanTup.BrowserSelector.csproj
index 23b4efc..6fa8c39 100644
--- a/DanTup.BrowserSelector/DanTup.BrowserSelector.csproj
+++ b/DanTup.BrowserSelector/DanTup.BrowserSelector.csproj
@@ -38,6 +38,9 @@
   <PropertyGroup>
     <ApplicationIcon>Browser.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,14 +60,18 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="BrowserSelector.ini">
+    <EmbeddedResource Include="BrowserSelector.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Browser.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/DanTup.BrowserSelector/Program.cs b/DanTup.BrowserSelector/Program.cs
index 5754eb9..ef02daf 100644
--- a/DanTup.BrowserSelector/Program.cs
+++ b/DanTup.BrowserSelector/Program.cs
@@ -1,60 +1,124 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Security.Principal;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using System.Xml;
 
 namespace DanTup.BrowserSelector
 {
 	class Program
 	{
-        static readonly Dictionary<string, string> SpecialCommands = new Dictionary<string, string>
-	    {
-	        {"edge", "microsoft-edge:{0}"}
-	    };
-
-        static void Main(string[] args)
+		static void Main(string[] args)
 		{
-			if (args == null || args.Length != 1 || !HandleArg(args[0]))
-				ShowHelpInfo();
-		}
+			string arg;
+			bool isOption,
+				waitForClose = false;
 
-		static bool HandleArg(string arg)
-		{
-			if (string.Equals(arg, "--register", StringComparison.OrdinalIgnoreCase))
+			if (args == null || args.Length == 0)
 			{
-				EnsureAdmin(arg);
-				RegistrySettings.RegisterBrowser();
+				ShowHelpInfo();
+				return;
 			}
-			else if (string.Equals(arg, "--unregister", StringComparison.OrdinalIgnoreCase))
+
+			for (int i = 0; i < args.Length; i++)
 			{
-				EnsureAdmin(arg);
-				RegistrySettings.UnregisterBrowser();
-			}
-			else if (arg.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || arg.StartsWith("https://", StringComparison.OrdinalIgnoreCase) || arg.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase))
-				LaunchBrowser(arg);
-			else
-				return false;
+				arg = args[i].Trim();
+
+				isOption = arg.StartsWith("-") || arg.StartsWith("/");
+				while (arg.StartsWith("-") || arg.StartsWith("/"))
+					arg = arg.Substring(1);
 
-			return true;
+				if (isOption)
+				{
+					if (string.Equals(arg, "register", StringComparison.OrdinalIgnoreCase))
+					{
+						EnsureAdmin("--" + arg);
+						RegistrySettings.RegisterBrowser();
+						return;
+					}
+					else if (string.Equals(arg, "unregister", StringComparison.OrdinalIgnoreCase))
+					{
+						EnsureAdmin("--" + arg);
+						RegistrySettings.UnregisterBrowser();
+						return;
+					}
+					else if (string.Equals(arg, "create", StringComparison.OrdinalIgnoreCase))
+					{
+						CreateSampleSettings();
+						return;
+					}
+					else if (string.Equals(arg, "wait", StringComparison.InvariantCultureIgnoreCase))
+					{
+						waitForClose = true;
+					}
+					else if (string.Equals(arg, "no-wait", StringComparison.InvariantCultureIgnoreCase))
+					{
+						waitForClose = false;
+					}
+				}
+				else
+				{
+					if (arg.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || arg.StartsWith("https://", StringComparison.OrdinalIgnoreCase) || arg.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase))
+					{
+						LaunchBrowser(arg, waitForClose);
+					}
+					else if (arg.EndsWith(".url", StringComparison.InvariantCultureIgnoreCase) || arg.EndsWith(".website", StringComparison.InvariantCultureIgnoreCase))
+					{
+						LaunchUrlFile(arg, waitForClose);
+					}
+					else if (arg.EndsWith(".webloc", StringComparison.InvariantCultureIgnoreCase))
+					{
+						LaunchWeblocFile(arg, waitForClose);
+					}
+					else
+					{
+						ShowHelpInfo();
+						return;
+					}
+				}
+			}
 		}
 
 		static void ShowHelpInfo()
 		{
 			MessageBox.Show(@"Usage:
 
-	BrowserSelector.exe --register
-		Register as web browser
+    BrowserSelector.exe --register
+        Register as web browser
+
+    BrowserSelector.exe --unregister
+        Unregister as web browser
+
+    BrowserSelector.exe --create
+        Creates a default/sample settings file
+
+Once you have registered the app as a browser, you should use visit ""Set Default Browser"" in Windows to set this app as the default browser.
+
+    BrowserSelector.exe ""http://example.org/""
+        Launch example.org
 
-	BrowserSelector.exe --unregister
-		Unregister as web browser
+    BrowserSelector.exe [--wait] ""http://example.org/""
+        Launch example.org, optionally waiting for the browser to close..
 
-	BrowserSelector.exe ""http://example.org/""
-		Launch example.org
+    BrowserSelector.exe ""http://example.org/"" ""http://example.com/"" [...]
+        Launches multiple urls
 
-Once you have registered the app as a browser, you should use visit ""Set Default Browser"" in Windows to set this app as the default browser.");
+    BrowserSelector.exe ""my bookmark file.url""
+        Launches the URL specified in the .url file
+
+    BrowserSelector.exe ""my bookmark file.webloc""
+        Launches the URL specified in the .webloc (osx) file
+
+If you use the --wait flag with multiple urls/files each will open one after the other, in order. Each waits for the previous to close before opening. Using the --wait flag is tricky, though, since many (most) browsers open new urls as a new tab in an existing instance.
+
+To open multiple urls at the same time and wait for them, try the following:
+
+    BrowserSelector.exe ""url-or-file"" ""url-or-file"" --wait ""url-or-file""", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
 		static void EnsureAdmin(string arg)
@@ -73,38 +137,170 @@ static void EnsureAdmin(string arg)
 		}
 
 
-		static void LaunchBrowser(string url)
+		static void LaunchUrlFile(string file, bool waitForClose = false)
+		{
+			string url = "";
+			string[] lines;
+
+			if (!File.Exists(file))
+			{
+				MessageBox.Show("Could not find or do not have access to .url file.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+
+			lines = File.ReadAllLines(file);
+			if (lines.Length < 2)
+			{
+				MessageBox.Show("Invalid .url file format.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+
+			foreach (string l in lines)
+			{
+				if (l.StartsWith("URL=", StringComparison.InvariantCulture))
+				{
+					url = l.Substring(4);
+					break;
+				}
+			}
+
+			if (url.Length > 0)
+			{
+				LaunchBrowser(url);
+			}
+			else
+			{
+				MessageBox.Show("Invalid shortcut file format.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+
+		static void LaunchWeblocFile(string file, bool waitForClose = false)
+		{
+			string url = "";
+			XmlDocument doc;
+			XmlNode node;
+
+			if (!File.Exists(file))
+			{
+				MessageBox.Show("Could not find or do not have access to .url file.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+
+			doc = new XmlDocument();
+			try
+			{
+				doc.Load(file);
+			}
+			catch (Exception)
+			{
+				MessageBox.Show("Could not read the .webloc file.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+
+			node = doc.DocumentElement.SelectSingleNode("//plist/dict/string");
+			if (node == null)
+			{
+				MessageBox.Show("Unknown or invalid .webloc file format.", "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+
+			url = node.InnerText;
+			if (url.Length > 0)
+			{
+				LaunchBrowser(url);
+			}
+		}
+
+		static void LaunchBrowser(string url, bool waitForClose = false)
 		{
 			try
 			{
 				var urlPreferences = ConfigReader.GetUrlPreferences();
+				string _url = url;
+				Uri uri = new Uri(_url);
+				Process p;
+
+				string pattern;
+				string domain = "", urlPattern;
 
 				foreach (var preference in urlPreferences)
 				{
-					// Escape the input for regex; the only special character we support is a *
-					var regex = Regex.Escape(preference.UrlPattern);
-					// Unescape * as a wildcard.
-					var pattern = string.Format("^{0}$", regex.Replace("\\*", ".*"));
+					urlPattern = preference.UrlPattern;
+
+					if (urlPattern.StartsWith("/") && urlPattern.EndsWith("/"))
+					{
+						// The domain from the INI file is a regex..
+						domain = uri.Authority + uri.AbsolutePath;
+						pattern = urlPattern.Substring(1, urlPattern.Length - 2);
+					}
+					else
+					{
+						// We're only checking the domain.
+						domain = uri.Authority;
 
-					// We're only checking the domain.
-					var domain = new Uri(url).Authority;
+						// Escape the input for regex; the only special character we support is a *
+						var regex = Regex.Escape(urlPattern);
+						// Unescape * as a wildcard.
+						pattern = string.Format("^{0}$", regex.Replace("\\*", ".*"));
+					}
 
 					if (Regex.IsMatch(domain, pattern))
 					{
-					    if (SpecialCommands.ContainsKey(preference.Browser.Name))
-					        Process.Start(string.Format(SpecialCommands[preference.Browser.Name], url));
-					    else
-					        Process.Start(preference.Browser.Location, url);
-					    return;
+						string loc = preference.Browser.Location;
+						if (loc.IndexOf("{url}") > -1)
+						{
+							loc = loc.Replace("{url}", _url);
+							_url = "";
+						}
+						if (loc.StartsWith("\"") && loc.IndexOf('"', 2) > -1)
+						{
+							// Assume the quoted item is the executable, while everything
+							// after (the second quote), is part of the command-line arguments.
+							loc = loc.Substring(1);
+							int pos = loc.IndexOf('"');
+							string args = loc.Substring(pos + 1).Trim();
+							loc = loc.Substring(0, pos).Trim();
+							p = Process.Start(loc, args + " " + _url);
+						}
+						else
+						{
+							// The browser specified in the INI file is a single executable
+							// without any other arguments.
+							// (normal/original behavior)
+							p = Process.Start(loc, _url);
+						}
+
+						if (waitForClose)
+						{
+							p.WaitForExit();
+						}
+
+						return;
 					}
 				}
 
-				MessageBox.Show(string.Format("Unable to find a suitable browser matching {0}.", url));
+				MessageBox.Show(string.Format("Unable to find a suitable browser matching {0}.", url), "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 			catch (Exception ex)
 			{
-				MessageBox.Show(string.Format("Unable to launch browser, sorry :(\r\n\r\nPlease send a copy of this error to DanTup.\r\n\r\n{0}.", ex.ToString()));
+				MessageBox.Show(string.Format("Unable to launch browser, sorry :(\r\n\r\nPlease send a copy of this error to DanTup.\r\n\r\n{0}.", ex.ToString()), "BrowserSelector", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
+
+
+		static void CreateSampleSettings()
+		{
+			DialogResult r = DialogResult.Yes;
+
+			if (File.Exists(ConfigReader.ConfigPath))
+			{
+				r = MessageBox.Show(@"The settings file already exists. Would you like to replace it with the sample file? (The existing file will be saved/renamed.)", "BrowserSelector", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+			}
+
+			if (r == DialogResult.No)
+				return;
+
+			ConfigReader.CreateSampleIni();
+		}
 	}
 }
diff --git a/README.md b/README.md
index dee4879..c258a44 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 
 Small utility to launch a different browser depending on the domain of the url being launched.
 
-### Only tested on Windows 8.1 so far :)
-
 ## Setting Up
 
 1. Grab the [latest release](https://github.com/DanTup/BrowserSelector/releases) and extract to a folder somewhere on your PC.
@@ -12,17 +10,55 @@ Small utility to launch a different browser depending on the domain of the url b
 4. Open the "Choose a default browser" screen in Windows (you can simply search for "default browser" from the start screen).
 5. Select DanTup.BrowserSelector as the default browser.
 
+So far, it has been tested on the following:
+
+* Windows 8.1
+* Windows 10 Pro
+
+## Usage
+
+    BrowserSelector.exe --register
+        Register as web browser
+
+    BrowserSelector.exe --unregister
+        Unregister as web browser
+
+    BrowserSelector.exe --create
+        Creates a default/sample settings file
+
+    BrowserSelector.exe "http://example.org/"
+        Launch example.org
+
+    BrowserSelector.exe [--wait] "http://example.org/"
+        Launch example.org, optionally waiting for the browser to close..
+
+    BrowserSelector.exe "http://example.org/" "http://example.com/" [...]
+        Launches multiple urls
+
+    BrowserSelector.exe "my bookmark file.url"
+        Launches the URL specified in the .url file.
+
+    BrowserSelector.exe "my bookmark file.webloc"
+        Launches the URL specified in the .webloc (osx) file.
+
+If you use the --wait flag with multiple urls/files each will open one after the other, in order. Each waits for the previous to close before opening. Using the --wait flag is tricky, though, since many (most) browsers open new urls as a new tab in an existing instance.
+
+To open multiple urls at the same time and wait for them, try the following:
+
+    BrowserSelector.exe "url-or-file" "url-or-file" --wait "url-or-file"
+
 ## Config
 
 Config is a poor mans INI file:
 
 	; Default browser is first in list
-	; Micrsoft Edge is a UWP app and requires no path
+	; Use `{url}` to specify UWP app browser details
 	[browsers]
 	chrome = C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
 	ff = C:\Program Files (x86)\Mozilla Firefox\firefox.exe
-	edge = 
+	edge = microsoft-edge:{url}
 	ie = iexplore.exe
+	chrome_prof8 = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" --profile-directory="Profile 8"
 
 	; Url preferences.
 	; Only * is treated as a special character (wildcard).
@@ -31,12 +67,51 @@ Config is a poor mans INI file:
 	[urls]
 	microsoft.com = ie
 	*.microsoft.com = ie
+	
+	; Use my project-based Chrome profile
+	myproject.live = chrome_prof8
+	myproject.local = chrome_prof8
+	
+	; if the key is wrapped in /'s, it is treated as a regex.
+	/sites\.google\.com/a/myproject.live\.com/ = chrome_prof8
+	
 	google.com = chrome
 	visualstudio.com = edge
 
-Notes:
+### Browsers
 
-- Browser paths must be exact paths to exes with no arguments (or in `PATH`). Values do not need to be quoted. Microsoft Edge is a UWP app which cannot be started like other browsers. The path can thus remain empty.
-- Only * is treated as a special character in URL patterns, and matches any characters.
+	chrome = C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
+	chrome_prof8 = "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" --profile-directory="Profile 8"
+
+- Browser exes must be exact paths to the browser executable.
+- Arguments are optional. However, if you provide arguments the exe _must_ be enclosed in quotes.
+- If there are no arguments, then the exe paths do not need to be quoted.
+
+**Special cases:**
+
+	edge = microsoft-edge:{url}
+
+- For special browsers, you can include the `{url}` flag. This allows better control over the browser command-line arguments.
+- This is required when specifying UWP app's such as Microsoft Edge.
+- By default, the url is used as an argument when launching the exe. If the `{url}` flag is specified, it will not be added to the arguments. (In other words, it _won't_ be added twice..)
+
+### Urls
+
+There are two ways to specify an Url. You can use simple wildcards or full regular expressions.
+
+**Simple wildcards:**
+
+	microsoft.com = ie
+	*.microsoft.com = ie
+
+- Only `*` is treated as a special character in URL patterns, and matches any characters (equivalent to the `.*` regex syntax).
 - Only the domain part (or IP address) of a URL is checked.
 - There is no implied wildcard at the start or end, so you must include these if you need them, but be aware that "microsoft.*" will not only match "microsoft.com" and "microsoft.co.uk" but also "microsoft.somethingelse.com".
+
+**Full regular expressions:**
+
+	/sites\.google\.com/a/myproject.live\.com/ = chrome_prof8
+
+- Full regular expressions are specified by wrapping it in /'s.
+- The domain _and_ path are used in the Url comparison.
+- The regular expression syntax is based on the Microsoft .NET implementation.