diff --git a/FortyOne.AudioSwitcher/AudioSwitcher.cs b/FortyOne.AudioSwitcher/AudioSwitcher.cs
index c15edc4..30368ea 100644
--- a/FortyOne.AudioSwitcher/AudioSwitcher.cs
+++ b/FortyOne.AudioSwitcher/AudioSwitcher.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows.Forms;
 using AudioSwitcher.AudioApi;
@@ -565,7 +566,14 @@ private void LoadSettings()
 
             var favDeviceStr = ConfigurationSettings.FavouriteDevices.Split(new[] { ",", "[", "]" }, StringSplitOptions.RemoveEmptyEntries);
 
-            FavouriteDeviceManager.LoadFavouriteDevices(Array.ConvertAll(favDeviceStr, x => new Guid(x)));
+            FavouriteDeviceManager.LoadFavouriteDevices(Array.ConvertAll(favDeviceStr, x =>
+            {
+                var r = new Regex(ConfigurationSettings.GUID_REGEX);
+                foreach(var match in r.Matches(x))
+                    return new Guid(match.ToString());
+
+                return Guid.Empty;
+            }));
 
             RegistryKey runKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
             //Ensure the registry key is added/removed
diff --git a/packaging/compile.bat b/packaging/compile.bat
new file mode 100644
index 0000000..a0d64fe
--- /dev/null
+++ b/packaging/compile.bat
@@ -0,0 +1 @@
+..\packages\ilmerge.2.13.0307\ilmerge /target:winexe /out:AudioSwitcher.exe ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.exe ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.AudioApi.dll ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.AudioApi.CoreAudio.dll ..\FortyOne.AudioSwitcher\bin\Release\WindowsInput.dll
\ No newline at end of file
diff --git a/packaging/libz.bat b/packaging/libz.bat
new file mode 100644
index 0000000..c736f26
--- /dev/null
+++ b/packaging/libz.bat
@@ -0,0 +1,2 @@
+..\packages\LibZ.Bootstrap.1.1.0.2\tools\libz sign-and-fix --include ..\FortyOne.AudioSwitcher\bin\Release\*.dll --include ..\FortyOne.AudioSwitcher\bin\Release\*.exe --key ..\FortyOne.AudioSwitcher\fortyone.snk
+..\packages\LibZ.Bootstrap.1.1.0.2\tools\libz inject-dll --assembly=..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.exe --include=..\FortyOne.AudioSwitcher\bin\Release\*.dll --key ..\FortyOne.AudioSwitcher\fortyone.snk --move
\ No newline at end of file