diff --git a/HISTORY.TXT b/HISTORY.TXT
index d9f13943c..1f446aabe 100644
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -1,5 +1,8 @@
 RELEASE HISTORY
 
+25/04/2016 v1.1-beta.517
+    - Fixed concurrency issue in method IsScheduling
+
 17/04/2016 v1.1-beta.516
     - Replaced nmqtt library with M2Mqyy.Net
     - Fixed Data.Module.NeedsUdpdate serialization bug
diff --git a/HomeGenie/release_info.xml b/HomeGenie/release_info.xml
index a969b90c7..996744ebc 100644
--- a/HomeGenie/release_info.xml
+++ b/HomeGenie/release_info.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ReleaseInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Name>HomeGenie</Name>
-  <Version>1.1 beta r516</Version>
+  <Version>1.1 beta r517</Version>
   <Description>Latest public release.</Description>
-  <ReleaseNote>   - Replaced nmqtt library with M2Mqyy.Net
-    - Fixed Data.Module.NeedsUdpdate serialization bug
-    - Reset oldest 24 hours of data instead of whole DB when statistics DB exceed size limit
-    - Fixed Web Server (MIG) headers bug preventing client from caching files
-    - Added event raising when a module property is changed from the UI; deprecated HG.Automation.Programs.PostBack</ReleaseNote>
-  <ReleaseDate>2016-04-17T15:50:28.0000Z</ReleaseDate>
+  <ReleaseNote>   - Fixed concurrency issue in method IsScheduling</ReleaseNote>
+  <ReleaseDate>2016-04-25T20:50:11.0000Z</ReleaseDate>
 </ReleaseInfo>
diff --git a/HomeGenie_Linux/Packager/DEBIAN/md5sums b/HomeGenie_Linux/Packager/DEBIAN/md5sums
index 4f54634d1..586a66fcd 100644
--- a/HomeGenie_Linux/Packager/DEBIAN/md5sums
+++ b/HomeGenie_Linux/Packager/DEBIAN/md5sums
@@ -98,7 +98,7 @@ cf846d6c77f76532f9cdab3181b71b6c  usr/local/bin/homegenie/Common.Logging.Core.dl
 d127cd699e15cf5feb4df3cdd34b77df  usr/local/bin/homegenie/Raspberry.IO.InterIntegratedCircuit.dll
 2074c256e8b7a372e28490a436a8e04d  usr/local/bin/homegenie/NLog.dll
 1dcf890d5a0ac7fdcd3db320b629a3ca  usr/local/bin/homegenie/Raspberry.IO.Components.dll.config
-9f249a9560ee3a6d44dfe8ffb15fbcbc  usr/local/bin/homegenie/HISTORY.TXT
+8a8089538c29794864477ff5dd0ccc88  usr/local/bin/homegenie/HISTORY.TXT
 3435a8ca2eb89ec7fc13a463590121c0  usr/local/bin/homegenie/README.TXT
 9846d4ca3240e91061d60364f0d06363  usr/local/bin/homegenie/programs.xml
 436e6e45538eac4235415d3aa7d34acd  usr/local/bin/homegenie/modules.xml
@@ -1178,7 +1178,7 @@ b8459e32556b6e692fae8f9ff81817c9  usr/local/bin/homegenie/html/ui/core/popup.cro
 40acf64097f759ba725a1afb6f7075b8  usr/local/bin/homegenie/html/ui/core/popup.cronwizard.js
 9e90aad43d8acc5b45729f2296cb5907  usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll
 fdbb99c3e6c929e8f9ad15d2b490edb4  usr/local/bin/homegenie/HomeGenie.exe
-f9216f58947d48474938c108465a23b4  usr/local/bin/homegenie/release_info.xml
+78edcb9077ea4f23ecb96188c50c3825  usr/local/bin/homegenie/release_info.xml
 536920e88b28850b8df27484746134f4  usr/local/bin/homegenie/NetClientLib.dll
 5405413fff79b8d9c747aa900f60f082  usr/local/bin/homegenie/sqlite3.dll
 8b44d53cb2d7afc7ff215bd43df7fc40  usr/local/bin/homegenie/scheduler.xml
diff --git a/HomeGenie_Windows/Packager/setup.iss b/HomeGenie_Windows/Packager/setup.iss
index ae6f13478..e952fdd7c 100644
--- a/HomeGenie_Windows/Packager/setup.iss
+++ b/HomeGenie_Windows/Packager/setup.iss
@@ -4,10 +4,10 @@
 
 [Setup]
 AppName=HomeGenie
-AppVerName=HomeGenie 1.1 beta (r515)
+AppVerName=HomeGenie 1.1 beta (r517)
 AppPublisher=GenieLabs
 AppPublisherURL=http://www.homegenie.it
-AppVersion=1.1 beta (r515)
+AppVersion=1.1 beta (r517)
 DefaultDirName={pf}\HomeGenie
 DefaultGroupName=HomeGenie
 Compression=lzma
@@ -198,8 +198,8 @@ Type: files; Name: "{app}\SQLite.Interop.dll";
 ;Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; 
 
 [Icons]
-Name: "{group}\HomeGenie 1.1 beta (r515)"; Filename: "{app}\HomeGenieManager.exe"
-Name: "{group}\Uninstall HomeGenie 1.1 beta (r515)"; Filename: "{uninstallexe}"
+Name: "{group}\HomeGenie 1.1 beta (r517)"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\Uninstall HomeGenie 1.1 beta (r517)"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
 
 [Run]