diff --git a/hyperaudio.ahk b/HyperAudio.ahk
similarity index 84%
rename from hyperaudio.ahk
rename to HyperAudio.ahk
index bedbf83..6a402e3 100644
--- a/hyperaudio.ahk
+++ b/HyperAudio.ahk
@@ -5,6 +5,7 @@ Menu, Tray, NoStandard
 
 Menu, Tray, Add, Info, InfoMenu
 Menu, Tray, Add, Exit, MenuExit
+<<<<<<< HEAD:hyperaudio.ahk
 
 <<<<<<< HEAD:hyperaudio.ahk
 device1:="Headset"
@@ -34,6 +35,31 @@ IfExist, %installed_in%\hyperaudio.ini
 }
 
 >>>>>>> e698301... Gui Added. Admin Warning added. Config file added:HyperAudio.ahk
+=======
+
+versionnumber := "1.1"
+device1 := "Headset"
+device2 := "Lautsprecher"
+
+if not A_IsAdmin
+{
+   msgbox, 48,Administrator Rights Warning, Please run as Admin.
+   sleep, 250
+   exitapp
+}
+
+
+installed_in=%A_ScriptDir%
+IfExist, %installed_in%\hyperaudio.ini
+{
+    iniread, device1, %installed_in%\hyperaudio.ini, Devices, Output1, %device1%
+    iniread, device2, %installed_in%\hyperaudio.ini, Devices, Output2, %device2%
+} else {
+    iniwrite, %device1%, %installed_in%\hyperaudio.ini, Devices, Output1
+    iniwrite, %device2%, %installed_in%\hyperaudio.ini, Devices, Output2
+}
+
+>>>>>>> e6983016938e949bb809e797643ad89e4178e4f7:HyperAudio.ahk
 Devices := {}
 IMMDeviceEnumerator := ComObjCreate("{BCDE0395-E52F-467C-8E3D-C4579291692E}", "{A95664D2-9614-4F35-A746-DE8DB63617E6}")
 
diff --git a/hyperaudio.exe b/HyperAudio.exe
similarity index 100%
rename from hyperaudio.exe
rename to HyperAudio.exe
diff --git a/hyperaudio.ico b/HyperAudio.ico
similarity index 100%
rename from hyperaudio.ico
rename to HyperAudio.ico