diff --git a/Agent.csproj b/Agent.csproj
index d24f54d..c344564 100644
--- a/Agent.csproj
+++ b/Agent.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Agent</RootNamespace>
     <AssemblyName>WOLAgent</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Agent.Program</StartupObject>
@@ -42,6 +45,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -63,6 +67,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 176f8f0..33a169d 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("WOLAgent")]
 [assembly: AssemblyDescription("Aquila WOL Agent")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Aquila Technology")]
 [assembly: AssemblyProduct("Agent")]
-[assembly: AssemblyCopyright("Copyright (c) 2004 - 2014, Aquila Technology, LLC.")]
+[assembly: AssemblyCopyright("Copyright (c) 2004 - 2016, Aquila Technology, LLC.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/app.config b/app.config
new file mode 100644
index 0000000..92ed828
--- /dev/null
+++ b/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/installer/WOLAgent.iss b/installer/WOLAgent.iss
new file mode 100644
index 0000000..c75e7f7
--- /dev/null
+++ b/installer/WOLAgent.iss
@@ -0,0 +1,103 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "WOLAgent"
+#define MyAppPublisher "Aquila Technology"
+#define MyAppURL "http://wol.aquilatech.com/"
+#define rootFolder "C:\Projects\agent"
+#define MyAppExeName "WOLAgent.exe"
+#define MyDescription "Aquila WOL Agent"
+#define MyAppVersion GetFileVersion("C:\Projects\Agent\bin\Release\WOLAgent.exe")
+
+#define signtool "c:\Program Files (x86)\Windows Kits\10\bin\x64\signtool.exe"
+#define subject "Open Source Developer, Phillip Tull"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{E0E4F4B0-2D93-4E03-B540-9198094045C4}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName=WOLAgent
+OutputDir=Release
+OutputBaseFilename={#MyAppName}_{#MyAppVersion}
+Compression=lzma
+SolidCompression=yes
+ArchitecturesInstallIn64BitMode=x64 ia64
+
+; declare mysign=$p
+SignTool=mysign {#signtool} sign /a /n $q{#subject}$q /fd sha1 /t http://timestamp.comodoca.com/authenticode /d $q{#MyAppName}$q $f
+SignTool=mysign {#signtool} sign /a /n $q{#subject}$q /as /fd sha256 /td sha256 /tr http://timestamp.comodoca.com/rfc3161 /d $q{#MyAppName}$q $f
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "{#rootFolder}\bin\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: BeforeServiceInstall('{#MyAppName}', '{#MyAppExeName}'); AfterInstall: AfterServiceInstall('{#MyAppName}', '{#MyAppExeName}')
+
+[Registry]
+Root: "HKLM"; Subkey: "SYSTEM\CurrentControlSet\Services\{#MyAppName}"; ValueType: string; ValueName: "Description"; ValueData: "Passes WOL packets between networks."; Flags: createvalueifdoesntexist deletevalue
+
+[Code]
+#include "services_unicode.iss"
+
+procedure BeforeServiceInstall(SvcName, FileName: String);
+var
+  S: Longword;
+begin
+  //If service is installed, it needs to be stopped
+  if ServiceExists(SvcName) then begin
+    S:= SimpleQueryService(SvcName);
+    if S <> SERVICE_STOPPED then begin
+      SimpleStopService(SvcName, True, True);
+    end;
+  end;
+end;
+
+procedure AfterServiceInstall(SvcName, FileName: String);
+begin
+  //If service is not installed, it needs to be installed now
+  if not ServiceExists(SvcName) then begin
+    if SimpleCreateService(SvcName, '{#MyDescription}', ExpandConstant('{app}')+'\' + FileName, SERVICE_AUTO_START, '', '', False, True) then begin
+      //Service successfully installed
+      SimpleStartService(SvcName, True, True);
+    end else begin
+      //Service failed to install
+    end;
+  end;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+  mRes : integer;
+  S: Longword;
+  SvcName : String;
+
+begin
+  SvcName := '{#MyAppName}';
+  case CurUninstallStep of
+    usUninstall:
+      begin
+        mRes := MsgBox('Do you want to remove the {#MyAppName} service?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2)
+        if mRes = IDYES then
+          begin
+            //If service is installed, it needs to be stopped
+            if ServiceExists(SvcName) then begin
+              S:= SimpleQueryService(SvcName);
+              if S <> SERVICE_STOPPED then begin
+                SimpleStopService(SvcName, True, True);
+              end;
+              SimpleDeleteService(SvcName);
+            end;
+          end;
+      end;
+  end;
+end;
diff --git a/installer/services_unicode.iss b/installer/services_unicode.iss
new file mode 100644
index 0000000..de6060b
--- /dev/null
+++ b/installer/services_unicode.iss
@@ -0,0 +1,466 @@
+//
+// Services functions for InnoSetup 5.x
+//
+// The contents of this file are subject to the Mozilla Public License
+// Version 1.1 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is services.iss.
+//
+// The Initial Developer of the Original Code is Luigi D. Sandon
+// Copyright © 2006-2010 Luigi D. Sandon. All Rights Reserved.
+
+type
+  _SERVICE_STATUS = record
+    dwServiceType: Longword;
+    dwCurrentState: Longword;
+    dwControlsAccepted: Longword;
+    dwWin32ExitCode: Longword;
+    dwServiceSpecificExitCode: Longword;
+    dwCheckPoint: Longword;
+    dwWaitHint: Longword;
+  end;
+
+const
+  NO_ERROR = 0;
+  STANDARD_RIGHTS_REQUIRED = $F0000;
+
+  //
+  // Service Control Manager object specific access types
+  //
+  SC_MANAGER_CONNECT = $0001;
+  SC_MANAGER_CREATE_SERVICE = $0002;
+  SC_MANAGER_ENUMERATE_SERVICE = $0004;
+  SC_MANAGER_LOCK = $0008;
+  SC_MANAGER_QUERY_LOCK_STATUS = $0010;
+  SC_MANAGER_MODIFY_BOOT_CONFIG = $0020;
+
+  SC_MANAGER_ALL_ACCESS  =
+    (STANDARD_RIGHTS_REQUIRED +
+    SC_MANAGER_CONNECT +
+    SC_MANAGER_CREATE_SERVICE +
+    SC_MANAGER_ENUMERATE_SERVICE +
+    SC_MANAGER_LOCK +
+    SC_MANAGER_QUERY_LOCK_STATUS +
+    SC_MANAGER_MODIFY_BOOT_CONFIG);
+
+  //
+  // Service Types (Bit Mask)
+  //
+  SERVICE_KERNEL_DRIVER = $00000001;
+  SERVICE_FILE_SYSTEM_DRIVER = $00000002;
+  SERVICE_ADAPTER = $00000004;
+  SERVICE_RECOGNIZER_DRIVER = $00000008;
+
+  SERVICE_DRIVER =
+    (SERVICE_KERNEL_DRIVER +
+     SERVICE_FILE_SYSTEM_DRIVER +
+     SERVICE_RECOGNIZER_DRIVER);
+
+  SERVICE_WIN32_OWN_PROCESS = $00000010;
+  SERVICE_WIN32_SHARE_PROCESS = $00000020;
+  SERVICE_WIN32 =
+    (SERVICE_WIN32_OWN_PROCESS +
+    SERVICE_WIN32_SHARE_PROCESS);
+
+  SERVICE_INTERACTIVE_PROCESS = $00000100;
+
+  SERVICE_TYPE_ALL =
+    (SERVICE_WIN32 +
+    SERVICE_ADAPTER +
+    SERVICE_DRIVER +
+    SERVICE_INTERACTIVE_PROCESS);
+
+  //
+  // Start Type
+  //
+  SERVICE_BOOT_START = $00000000;
+  SERVICE_SYSTEM_START = $00000001;
+  SERVICE_AUTO_START = $00000002;
+  SERVICE_DEMAND_START = $00000003;
+  SERVICE_DISABLED = $00000004;
+
+  //
+  // Error control type
+  //
+  SERVICE_ERROR_IGNORE = $00000000;
+  SERVICE_ERROR_NORMAL = $00000001;
+  SERVICE_ERROR_SEVERE = $00000002;
+  SERVICE_ERROR_CRITICAL = $00000003;
+
+  //
+  // Service object specific access type
+  //
+  SERVICE_QUERY_CONFIG = $0001;
+  SERVICE_CHANGE_CONFIG = $0002;
+  SERVICE_QUERY_STATUS = $0004;
+  SERVICE_ENUMERATE_DEPENDENTS = $0008;
+  SERVICE_START= $0010;
+  SERVICE_STOP= $0020;
+  SERVICE_PAUSE_CONTINUE = $0040;
+  SERVICE_INTERROGATE = $0080;
+  SERVICE_USER_DEFINED_CONTROL = $0100;
+
+  SERVICE_ALL_ACCESS =
+    (STANDARD_RIGHTS_REQUIRED +
+    SERVICE_QUERY_CONFIG +
+    SERVICE_CHANGE_CONFIG +
+    SERVICE_QUERY_STATUS +
+    SERVICE_ENUMERATE_DEPENDENTS +
+    SERVICE_START +
+    SERVICE_STOP +
+    SERVICE_PAUSE_CONTINUE +
+    SERVICE_INTERROGATE +
+    SERVICE_USER_DEFINED_CONTROL);
+
+  //
+  // Controls
+  //
+  SERVICE_CONTROL_STOP = $00000001;
+  SERVICE_CONTROL_PAUSE = $00000002;
+  SERVICE_CONTROL_CONTINUE = $00000003;
+  SERVICE_CONTROL_INTERROGATE = $00000004;
+
+  //
+  // Status
+  //
+  SERVICE_CONTINUE_PENDING = $00000005;
+  SERVICE_PAUSE_PENDING = $00000006;
+  SERVICE_PAUSED = $00000007;
+  SERVICE_RUNNING = $00000004;
+  SERVICE_START_PENDING = $00000002;
+  SERVICE_STOP_PENDING = $00000003;
+  SERVICE_STOPPED = $00000001;
+
+
+  //
+  //  Error codes
+  //
+  ERROR_DEPENDENT_SERVICES_RUNNING = 1051;
+  ERROR_INVALID_SERVICE_CONTROL = 1052;
+  ERROR_SERVICE_REQUEST_TIMEOUT = 1053;
+  ERROR_SERVICE_NO_THREAD = 1054;
+  ERROR_SERVICE_DATABASE_LOCKED = 1055;
+  ERROR_SERVICE_ALREADY_RUNNING = 1056;
+  ERROR_INVALID_SERVICE_ACCOUNT = 1057;
+  ERROR_SERVICE_DISABLED = 1058;
+  ERROR_CIRCULAR_DEPENDENCY = 1059;
+  ERROR_SERVICE_DOES_NOT_EXIST = 1060;
+  ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061;
+  ERROR_SERVICE_NOT_ACTIVE = 1062;
+  ERROR_FAILED_SERVICE_CONTROLLER_CONNECT = 1063;
+  ERROR_EXCEPTION_IN_SERVICE = 1064;
+  ERROR_DATABASE_DOES_NOT_EXIST = 1065;
+  ERROR_SERVICE_SPECIFIC_ERROR = 1066;
+  ERROR_PROCESS_ABORTED = 1067;
+  ERROR_SERVICE_DEPENDENCY_FAIL = 1068;
+  ERROR_SERVICE_LOGON_FAILED = 1069;
+  ERROR_SERVICE_START_HANG = 1070;
+  ERROR_INVALID_SERVICE_LOCK = 1071;
+  ERROR_SERVICE_MARKED_FOR_DELETE = 1072;
+  ERROR_SERVICE_EXISTS = 1073;
+
+
+
+function OpenSCManager(lpMachineName: string; lpDatabaseName: string; dwDesiredAccess: Longword): Longword;
+  external 'OpenSCManagerW@advapi32.dll stdcall';
+
+//
+// lpServiceName is the service name, not the service display name
+//
+
+function OpenService(hSCManager: Longword; lpServiceName: string; dwDesiredAccess: Longword): Longword;
+  external 'OpenServiceW@advapi32.dll stdcall';
+
+function StartService(hService: Longword; dwNumServiceArgs: Longword; lpServiceArgVectors: string): Longword;
+  external 'StartServiceW@advapi32.dll stdcall';
+
+function CloseServiceHandle(hSCObject: Longword): Longword;
+  external 'CloseServiceHandle@advapi32.dll stdcall';
+
+function ControlService(hService: Longword; dwControl: Longword; var lpServiceStatus: _SERVICE_STATUS): Longword;
+  external 'ControlService@advapi32.dll stdcall';
+
+function CreateService(hSCManager: Longword;
+  lpServiceName: string;
+  lpDisplayName: string;
+  dwDesiredAccess: Longword;
+  dwServiceType: Longword;
+  dwStartType: Longword;
+  dwErrorControl: Longword;
+  lpBinaryPathName: string;
+  lpLoadOrderGroup: string;
+  lpdwTagId: Longword;
+  lpDependencies: string;
+  lpServiceStartName: string;
+  lpPassword: string): Longword;
+  external 'CreateServiceW@advapi32.dll stdcall';
+
+function DeleteService(hService: Longword): Longword;
+  external 'DeleteService@advapi32.dll stdcall';
+
+function LockServiceDatabase(hSCManager: Longword): Longword;
+  external 'LockServiceDatabase@advapi32.dll stdcall';
+
+function UnlockServiceDatabase(ScLock: Longword): Longword;
+  external 'UnlockServiceDatabase@advapi32.dll stdcall';
+
+
+function SimpleCreateService(AServiceName, ADisplayName, AFileName: string;
+  AStartType: Longword; AUser, APassword: string; Interactive: Boolean; IgnoreExisting: Boolean): Boolean;
+var
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+  ServiceType: Longword;
+  dwTag: Longword;
+  Error: Integer;
+begin
+  Result := False;
+  dwTag := 0;
+  ServiceType := SERVICE_WIN32_OWN_PROCESS;
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AServiceName + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      if AUser = '' then
+      begin
+        if Interactive then
+          ServiceType := ServiceType + SERVICE_INTERACTIVE_PROCESS;
+        APassword := '';
+      end;
+      ServiceHandle := CreateService(SCMHandle, AServiceName, ADisplayName, SERVICE_ALL_ACCESS, ServiceType,
+        AStartType, SERVICE_ERROR_NORMAL, AFileName, '', 0, '', AUser, APassword);
+      if ServiceHandle = 0 then
+      begin
+        Error := DLLGetLastError;
+        if IgnoreExisting and (Error = ERROR_SERVICE_EXISTS) then
+          Exit
+        else
+          RaiseException('CreateService: ' + AServiceName + ' ' + SysErrorMessage(Error));
+      end;
+      Result := True;
+    finally
+      if ServiceHandle <> 0 then
+        CloseServiceHandle(ServiceHandle);
+    end;
+  finally
+    if SCMHandle <> 0 then
+      CloseServiceHandle(SCMHandle);
+  end;
+end;
+
+function WaitForService(ServiceHandle: Longword; AStatus: Longword): Boolean;
+var
+  PendingStatus: Longword;
+  ServiceStatus: _SERVICE_STATUS;
+  Error: Integer;
+begin
+  Result := False;
+
+  case AStatus of
+    SERVICE_RUNNING: PendingStatus := SERVICE_START_PENDING;
+    SERVICE_STOPPED: PendingStatus := SERVICE_STOP_PENDING;
+  end;
+
+  repeat
+    if ControlService(ServiceHandle, SERVICE_CONTROL_INTERROGATE, ServiceStatus) = 0 then
+    begin
+      Error := DLLGetLastError;
+      RaiseException('ControlService: ' + SysErrorMessage(Error));
+    end;
+    if ServiceStatus.dwWin32ExitCode <> 0 then
+      Break;
+    Result := ServiceStatus.dwCurrentState = AStatus;
+    if not Result and (ServiceStatus.dwCurrentState = PendingStatus) then
+      Sleep(ServiceStatus.dwWaitHint)
+    else
+      Break;
+  until Result;
+end;
+
+procedure SimpleStopService(AService: string; Wait, IgnoreStopped: Boolean);
+var
+  ServiceStatus: _SERVICE_STATUS;
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+  Error: Integer;
+begin
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      ServiceHandle := OpenService(SCMHandle, AService, SERVICE_ALL_ACCESS);
+      if ServiceHandle = 0 then
+        RaiseException('OpenService: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+      try
+        if ControlService(ServiceHandle, SERVICE_CONTROL_STOP, ServiceStatus) = 0 then
+        begin
+          Error := DLLGetLastError;
+          if IgnoreStopped and (Error = ERROR_SERVICE_NOT_ACTIVE) then
+            Exit
+          else
+            RaiseException('ControlService: ' + AService + ' ' + SysErrorMessage(Error));
+          if Wait then
+            WaitForService(ServiceHandle, SERVICE_STOPPED);
+        end;
+      finally
+        if ServiceHandle <> 0 then
+          CloseServiceHandle(ServiceHandle);
+      end;
+    finally
+      if SCMHandle <> 0 then
+        CloseServiceHandle(SCMHandle);
+    end;
+  except
+    ShowExceptionMessage;
+  end;
+end;
+
+procedure SimpleStartService(AService: string; Wait, IgnoreStarted: Boolean);
+var
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+  Error: Integer;
+begin
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      ServiceHandle := OpenService(SCMHandle, AService, SERVICE_ALL_ACCESS);
+      if ServiceHandle = 0 then
+        RaiseException('OpenService: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+      try
+        if StartService(ServiceHandle, 0, '') = 0 then
+        begin
+          Error := DLLGetLastError;
+          if IgnoreStarted and (Error = ERROR_SERVICE_ALREADY_RUNNING) then
+            Exit
+          else
+            RaiseException('StartService: ' + AService + ' ' + SysErrorMessage(Error));
+          if Wait then
+          begin
+            WaitForService(ServiceHandle, SERVICE_RUNNING);
+          end;
+        end;
+      finally
+        if ServiceHandle <> 0 then
+          CloseServiceHandle(ServiceHandle);
+      end;
+    finally
+      if SCMHandle <> 0 then
+        CloseServiceHandle(SCMHandle);
+    end;
+  except
+    ShowExceptionMessage;
+  end;
+end;
+
+procedure SimpleDeleteService(AService: string);
+var
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+begin
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      ServiceHandle := OpenService(SCMHandle, AService, SERVICE_ALL_ACCESS);
+      if ServiceHandle = 0 then
+        RaiseException('OpenService: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+      try
+        if DeleteService(ServiceHandle) = 0 then
+          RaiseException('StartService: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+      finally
+        if ServiceHandle <> 0 then
+          CloseServiceHandle(ServiceHandle);
+      end;
+    finally
+      if SCMHandle <> 0 then
+        CloseServiceHandle(SCMHandle);
+    end;
+  except
+    ShowExceptionMessage;
+  end;
+end;
+
+function ServiceExists(AService: string): Boolean;
+var
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+  Error: Integer;
+begin
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      ServiceHandle := OpenService(SCMHandle, AService, SERVICE_ALL_ACCESS);
+      try
+        if ServiceHandle = 0 then
+        begin
+          Error := DLLGetLastError;
+          if Error = ERROR_SERVICE_DOES_NOT_EXIST then
+            Result := False
+          else
+            RaiseException('OpenService: ' + AService + ' ' + SysErrorMessage(Error));
+        end
+        else
+          Result := True;
+      finally
+        if ServiceHandle <> 0 then
+          CloseServiceHandle(ServiceHandle);
+      end;
+    finally
+      if SCMHandle <> 0 then
+        CloseServiceHandle(SCMHandle);
+    end;
+  except
+    ShowExceptionMessage;
+  end;
+end;
+
+function SimpleQueryService(AService: string): Longword;
+var
+  ServiceStatus: _SERVICE_STATUS;
+  SCMHandle: Longword;
+  ServiceHandle: Longword;
+  Error: Integer;
+begin
+  Result := 0;
+  try
+    SCMHandle := OpenSCManager('', '', SC_MANAGER_ALL_ACCESS);
+    if SCMHandle = 0 then
+      RaiseException('OpenSCManager: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+    try
+      ServiceHandle := OpenService(SCMHandle, AService, SERVICE_ALL_ACCESS);
+      if ServiceHandle = 0 then
+        RaiseException('OpenService: ' + AService + ' ' + SysErrorMessage(DLLGetLastError));
+      try
+        if ControlService(ServiceHandle, SERVICE_CONTROL_INTERROGATE, ServiceStatus) = 0 then
+        begin
+          Error := DLLGetLastError;
+          RaiseException('ControlService: ' + AService + ' ' + SysErrorMessage(Error));
+        end;
+        Result := ServiceStatus.dwCurrentState;
+      finally
+        if ServiceHandle <> 0 then
+          CloseServiceHandle(ServiceHandle);
+      end;
+    finally
+      if SCMHandle <> 0 then
+        CloseServiceHandle(SCMHandle);
+    end;
+  except
+    ShowExceptionMessage;
+  end;
+end;