diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 88782ea..0b967e5 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -25,7 +25,7 @@ env:
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
   # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
-  BUILD_VERSION: 1.0.15.6 # Version
+  BUILD_VERSION: 1.0.15.11 # Version
 #
 permissions: 
   actions: write
diff --git a/ProductVersionInfo.cmd b/ProductVersionInfo.cmd
index 3d1198c..ea4cea6 100644
--- a/ProductVersionInfo.cmd
+++ b/ProductVersionInfo.cmd
@@ -3,6 +3,6 @@
 rem cd %~dp0
 rem %~d0
 
-set PRODUCT_VERSION_VERS=1.0.15.6
+set PRODUCT_VERSION_VERS=1.0.15.11
 
 @exit /b
diff --git a/ProductVersionInfo.txt b/ProductVersionInfo.txt
index d7fd4f2..9db260a 100644
--- a/ProductVersionInfo.txt
+++ b/ProductVersionInfo.txt
@@ -1,4 +1,4 @@
-1.0.15.6
+1.0.15.11
 wsrm
-wsrm (x86) : Tue May 28 10:34 1.0.15.6
-wsrm (x64) : Tue May 28 10:34 1.0.15.6
+wsrm (x86) : Sun Oct 06 13:04 1.0.15.11
+wsrm (x64) : Sun Oct 06 13:04 1.0.15.11
diff --git a/ProductVersionSize.txt b/ProductVersionSize.txt
index a459f1a..27b244b 100644
--- a/ProductVersionSize.txt
+++ b/ProductVersionSize.txt
@@ -1 +1 @@
-1.0.15.006
+1.0.15.011
diff --git a/wsrm/AutomaticCompilerVersion.h b/wsrm/AutomaticCompilerVersion.h
new file mode 100644
index 0000000..69529a9
--- /dev/null
+++ b/wsrm/AutomaticCompilerVersion.h
@@ -0,0 +1,984 @@
+#pragma once
+
+#ifndef AUTOMATICOMPILERVERSION_H
+#define AUTOMATICOMPILERVERSION_H   1
+
+#ifndef _MSC_VER
+#define _MSC_VER        0
+#endif
+#ifndef _MSC_FULL_VER
+#define _MSC_FULL_VER   0
+#endif
+
+
+#if _MSC_VER >= 1940
+#define VS_VERSION_A        "Visual Studio > 2022 "
+#define VS_VERSION_W        L"Visual Studio > 2022 "
+#define VS_VERSION_N        _MSC_VER
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio > 2022 "
+#else
+#define VS_VERSION_T        "Visual Studio > 2022 "
+#endif
+
+#elif _MSC_FULL_VER >= 193933521
+#define VS_VERSION_A        "Visual Studio 2022 version 17.9.2"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.9.2"
+#define VS_VERSION_N        1939
+#define VS_VERSION_F        193933521
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.9.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.9.2"
+#endif
+
+#elif _MSC_FULL_VER >= 193833133
+#define VS_VERSION_A        "Visual Studio 2022 version 17.8.3"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.8.3"
+#define VS_VERSION_N        1938
+#define VS_VERSION_F        193833133
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.8.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.8.3"
+#endif
+
+#elif _MSC_FULL_VER >= 193732822
+#define VS_VERSION_A        "Visual Studio 2022 version 17.7.0"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.7.0"
+#define VS_VERSION_N        1937
+#define VS_VERSION_F        193732822
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.7.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.7.0"
+#endif
+
+#elif _MSC_FULL_VER >= 193632532
+#define VS_VERSION_A        "Visual Studio 2022 version 17.6.2"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.6.2"
+#define VS_VERSION_N        1936
+#define VS_VERSION_F        193632532
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.6.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.6.2"
+#endif
+
+#elif _MSC_FULL_VER >= 193532217
+#define VS_VERSION_A        "Visual Studio 2022 version 17.5.4"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.5.4"
+#define VS_VERSION_N        1935
+#define VS_VERSION_F        193532217
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.5.4"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.5.4"
+#endif
+
+#elif _MSC_FULL_VER >= 193431944
+#define VS_VERSION_A        "Visual Studio 2022 version 17.4.9"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.4.9"
+#define VS_VERSION_N        1934
+#define VS_VERSION_F        193431944
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.4.9"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.4.9"
+#endif
+
+#elif _MSC_FULL_VER >= 193331630
+#define VS_VERSION_A        "Visual Studio 2022 version 17.3.6"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.3.6"
+#define VS_VERSION_N        1933
+#define VS_VERSION_F        193331630
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.3.6"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.3.6"
+#endif
+
+#elif _MSC_FULL_VER >= 193231329
+#define VS_VERSION_A        "Visual Studio 2022 version 17.2.2"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.2.2"
+#define VS_VERSION_N        1932
+#define VS_VERSION_F        193231329
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.2.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.2.2"
+#endif
+
+#elif _MSC_FULL_VER >= 193030706
+#define VS_VERSION_A        "Visual Studio 2022 version 17.0.2"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.0.2"
+#define VS_VERSION_N        1930
+#define VS_VERSION_F        193030706
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.0.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.0.2"
+#endif
+
+#elif _MSC_FULL_VER >= 193030705
+#define VS_VERSION_A        "Visual Studio 2022 version 17.0.1"
+#define VS_VERSION_W        L"Visual Studio 2022 version 17.0.1"
+#define VS_VERSION_N        1930
+#define VS_VERSION_F        193030705
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2022 version 17.0.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2022 version 17.0.1"
+#endif
+
+#elif _MSC_FULL_VER >= 192930133
+#define VS_VERSION_A        "Visual Studio 2019 version 16.11.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.11.2"
+#define VS_VERSION_N        1929
+#define VS_VERSION_F        192930133
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.11.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.11.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192829913
+#define VS_VERSION_A        "Visual Studio 2019 version 16.9.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.9.2"
+#define VS_VERSION_N        1928
+#define VS_VERSION_F        192829913
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.9.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.9.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192829334
+#define VS_VERSION_A        "Visual Studio 2019 version 16.8.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.8.2"
+#define VS_VERSION_N        1928
+#define VS_VERSION_F        192829334
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.8.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.8.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192829333
+#define VS_VERSION_A        "Visual Studio 2019 version 16.8.1"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.8.1"
+#define VS_VERSION_N        1928
+#define VS_VERSION_F        192829333
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.8.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.8.1"
+#endif
+
+#elif _MSC_FULL_VER >= 192729112
+#define VS_VERSION_A        "Visual Studio 2019 version 16.7"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.7"
+#define VS_VERSION_N        1927
+#define VS_VERSION_F        192729112
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.7"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.7"
+#endif
+
+#elif _MSC_FULL_VER >= 192628806
+#define VS_VERSION_A        "Visual Studio 2019 version 16.6.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.6.2"
+#define VS_VERSION_N        1926
+#define VS_VERSION_F        192628806
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.6.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.6.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192528611
+#define VS_VERSION_A        "Visual Studio 2019 version 16.5.1"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.5.1"
+#define VS_VERSION_N        1925
+#define VS_VERSION_F        192528611
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.5.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.5.1"
+#endif
+
+#elif _MSC_FULL_VER >= 192428314
+#define VS_VERSION_A        "Visual Studio 2019 version 16.4.0"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.4.0"
+#define VS_VERSION_N        1924
+#define VS_VERSION_F        192428314
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.4.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.4.0"
+#endif
+
+#elif _MSC_FULL_VER >= 192328105
+#define VS_VERSION_A        "Visual Studio 2019 version 16.3.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.3.2"
+#define VS_VERSION_N        1923
+#define VS_VERSION_F        192328105
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.3.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.3.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192227905
+#define VS_VERSION_A        "Visual Studio 2019 version 16.2.3"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.2.3"
+#define VS_VERSION_N        1922
+#define VS_VERSION_F        192227905
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.2.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.2.3"
+#endif
+
+#elif _MSC_FULL_VER >= 192127702
+#define VS_VERSION_A        "Visual Studio 2019 version 16.1.2"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.1.2"
+#define VS_VERSION_N        1921
+#define VS_VERSION_F        192127702
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.1.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.1.2"
+#endif
+
+#elif _MSC_FULL_VER >= 192027508
+#define VS_VERSION_A        "Visual Studio 2019 version 16.0.0"
+#define VS_VERSION_W        L"Visual Studio 2019 version 16.0.0"
+#define VS_VERSION_N        1920
+#define VS_VERSION_F        192027508
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2019 version 16.0.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2019 version 16.0.0"
+#endif
+
+#elif _MSC_FULL_VER >= 191627030
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.11"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.11"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        191627030
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.11"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.11"
+#endif
+
+#elif _MSC_FULL_VER >= 191627027
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.7"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.7"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        191627027
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.7"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.7"
+#endif
+
+#elif _MSC_FULL_VER >= 191627026
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.5"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.5"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        191627026
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.5"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.5"
+#endif
+
+#elif _MSC_FULL_VER >= 191627025
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.4"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.4"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        191627025
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.4"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.4"
+#endif
+
+#elif _MSC_FULL_VER >= 191627023
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.1"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.1"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        191627023
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.1"
+#endif
+
+#elif _MSC_VER >= 1916
+#define VS_VERSION_A        "Visual Studio 2017 version 15.9.0"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.9.0"
+#define VS_VERSION_N        1916
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.9.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.9.0"
+#endif
+
+#elif _MSC_VER >= 1915
+#define VS_VERSION_A        "Visual Studio 2017 version 15.8.0"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.8.0"
+#define VS_VERSION_N        1915
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.8.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.8.0"
+#endif
+
+#elif _MSC_FULL_VER >= 191426433
+#define VS_VERSION_A        "Visual Studio 2017 version 15.7.5"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.7.5"
+#define VS_VERSION_N        1914
+#define VS_VERSION_F        191426433
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.7.5"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.7.5"
+#endif
+
+#elif _MSC_FULL_VER >= 191426430
+#define VS_VERSION_A        "Visual Studio 2017 version 15.7.3"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.7.3"
+#define VS_VERSION_N        1914
+#define VS_VERSION_F        191426430
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.7.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.7.3"
+#endif
+
+#elif _MSC_FULL_VER >= 191426429
+#define VS_VERSION_A        "Visual Studio 2017 version 15.7.2"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.7.2"
+#define VS_VERSION_N        1914
+#define VS_VERSION_F        191426429
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.7.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.7.2"
+#endif
+
+#elif _MSC_FULL_VER >= 191426428
+#define VS_VERSION_A        "Visual Studio 2017 version 15.7.1"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.7.1"
+#define VS_VERSION_N        1914
+#define VS_VERSION_F        191426428
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.7.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.7.1"
+#endif
+
+#elif _MSC_FULL_VER >= 191326132
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.7"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.7"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326132
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.7"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.7"
+#endif
+
+#elif _MSC_FULL_VER >= 191326131
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.6"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.6"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326131
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.6"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.6"
+#endif
+
+#elif _MSC_FULL_VER >= 191326129
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.4"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.4"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326129
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.4"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.4"
+#endif
+
+#elif _MSC_FULL_VER >= 191326129
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.3"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.3"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326129
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.3"
+#endif
+
+#elif _MSC_FULL_VER >= 191326128
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.2"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.2"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326128
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.2"
+#endif
+
+#elif _MSC_FULL_VER >= 191326128
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.1"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.1"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326128
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.1"
+#endif
+
+#elif _MSC_FULL_VER >= 191326128
+#define VS_VERSION_A        "Visual Studio 2017 version 15.6.0"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.6.0"
+#define VS_VERSION_N        1913
+#define VS_VERSION_F        191326128
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.6.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.6.0"
+#endif
+
+#elif _MSC_FULL_VER >= 191225835
+#define VS_VERSION_A        "Visual Studio 2017 version 15.5.7"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.5.7"
+#define VS_VERSION_N        1912
+#define VS_VERSION_F        191225835
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.5.7"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.5.7"
+#endif
+
+#elif _MSC_FULL_VER >= 191225835
+#define VS_VERSION_A        "Visual Studio 2017 version 15.5.6"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.5.6"
+#define VS_VERSION_N        1912
+#define VS_VERSION_F        191225835
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.5.6"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.5.6"
+#endif
+
+#elif _MSC_FULL_VER >= 191225834
+#define VS_VERSION_A        "Visual Studio 2017 version 15.5.4"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.5.4"
+#define VS_VERSION_N        1912
+#define VS_VERSION_F        191225834
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.5.4"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.5.4"
+#endif
+
+#elif _MSC_FULL_VER >= 191225834
+#define VS_VERSION_A        "Visual Studio 2017 version 15.5.3"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.5.3"
+#define VS_VERSION_N        1912
+#define VS_VERSION_F        191225834
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.5.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.5.3"
+#endif
+
+#elif _MSC_FULL_VER >= 191225831
+#define VS_VERSION_A        "Visual Studio 2017 version 15.5.2"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.5.2"
+#define VS_VERSION_N        1912
+#define VS_VERSION_F        191225831
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.5.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.5.2"
+#endif
+
+#elif _MSC_FULL_VER >= 191125547
+#define VS_VERSION_A        "Visual Studio 2017 version 15.4.5"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.4.5"
+#define VS_VERSION_N        1911
+#define VS_VERSION_F        191125547
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.4.5"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.4.5"
+#endif
+
+#elif _MSC_FULL_VER >= 191125542
+#define VS_VERSION_A        "Visual Studio 2017 version 15.4.4"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.4.4"
+#define VS_VERSION_N        1911
+#define VS_VERSION_F        191125542
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.4.4"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.4.4"
+#endif
+
+#elif _MSC_FULL_VER >= 191125507
+#define VS_VERSION_A        "Visual Studio 2017 version 15.3.3"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.3.3"
+#define VS_VERSION_N        1911
+#define VS_VERSION_F        191125507
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.3.3"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.3.3"
+#endif
+
+#elif _MSC_FULL_VER >= 191025017
+#define VS_VERSION_A        "Visual Studio 2017 version 15.2"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.2"
+#define VS_VERSION_N        1910
+#define VS_VERSION_F        191025017
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.2"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.2"
+#endif
+
+#elif _MSC_FULL_VER >= 191025017
+#define VS_VERSION_A        "Visual Studio 2017 version 15.1"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.1"
+#define VS_VERSION_N        1910
+#define VS_VERSION_F        191025017
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.1"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.1"
+#endif
+
+#elif _MSC_FULL_VER >= 191025017
+#define VS_VERSION_A        "Visual Studio 2017 version 15.0"
+#define VS_VERSION_W        L"Visual Studio 2017 version 15.0"
+#define VS_VERSION_N        1910
+#define VS_VERSION_F        191025017
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2017 version 15.0"
+#else
+#define VS_VERSION_T        "Visual Studio 2017 version 15.0"
+#endif
+
+#elif _MSC_FULL_VER >= 190024210
+#define VS_VERSION_A        "Visual Studio 2015 Update 3 [14.0]"
+#define VS_VERSION_W        L"Visual Studio 2015 Update 3 [14.0]"
+#define VS_VERSION_N        1900
+#define VS_VERSION_F        190024210
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2015 Update 3 [14.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2015 Update 3 [14.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 190023918
+#define VS_VERSION_A        "Visual Studio 2015 Update 2 [14.0]"
+#define VS_VERSION_W        L"Visual Studio 2015 Update 2 [14.0]"
+#define VS_VERSION_N        1900
+#define VS_VERSION_F        190023918
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2015 Update 2 [14.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2015 Update 2 [14.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 190023506
+#define VS_VERSION_A        "Visual Studio 2015 Update 1 [14.0]"
+#define VS_VERSION_W        L"Visual Studio 2015 Update 1 [14.0]"
+#define VS_VERSION_N        1900
+#define VS_VERSION_F        190023506
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2015 Update 1 [14.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2015 Update 1 [14.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 190023026
+#define VS_VERSION_A        "Visual Studio 2015 [14.0]"
+#define VS_VERSION_W        L"Visual Studio 2015 [14.0]"
+#define VS_VERSION_N        1900
+#define VS_VERSION_F        190023026
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2015 [14.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2015 [14.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180040629
+#define VS_VERSION_A        "Visual Studio 2013 Update 5 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 Update 5 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180040629
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 Update 5 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 Update 5 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180031101
+#define VS_VERSION_A        "Visual Studio 2013 Update 4 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 Update 4 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180031101
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 Update 4 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 Update 4 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180030723
+#define VS_VERSION_A        "Visual Studio 2013 Update 3 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 Update 3 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180030723
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 Update 3 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 Update 3 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180030501
+#define VS_VERSION_A        "Visual Studio 2013 Update 2 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 Update 2 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180030501
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 Update 2 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 Update 2 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180021005
+#define VS_VERSION_A        "Visual Studio 2013 Update 1 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 Update 1 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180021005
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 Update 1 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 Update 1 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 180021005
+#define VS_VERSION_A        "Visual Studio 2013 [12.0]"
+#define VS_VERSION_W        L"Visual Studio 2013 [12.0]"
+#define VS_VERSION_N        1800
+#define VS_VERSION_F        180021005
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2013 [12.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2013 [12.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 170061030
+#define VS_VERSION_A        "Visual Studio 2012 Update 4 [11.0]"
+#define VS_VERSION_W        L"Visual Studio 2012 Update 4 [11.0]"
+#define VS_VERSION_N        1700
+#define VS_VERSION_F        170061030
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2012 Update 4 [11.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2012 Update 4 [11.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 170060610
+#define VS_VERSION_A        "Visual Studio 2012 Update 3 [11.0]"
+#define VS_VERSION_W        L"Visual Studio 2012 Update 3 [11.0]"
+#define VS_VERSION_N        1700
+#define VS_VERSION_F        170060610
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2012 Update 3 [11.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2012 Update 3 [11.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 170060315
+#define VS_VERSION_A        "Visual Studio 2012 Update 2 [11.0]"
+#define VS_VERSION_W        L"Visual Studio 2012 Update 2 [11.0]"
+#define VS_VERSION_N        1700
+#define VS_VERSION_F        170060315
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2012 Update 2 [11.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2012 Update 2 [11.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 170051106
+#define VS_VERSION_A        "Visual Studio 2012 Update 1 [11.0]"
+#define VS_VERSION_W        L"Visual Studio 2012 Update 1 [11.0]"
+#define VS_VERSION_N        1700
+#define VS_VERSION_F        170051106
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2012 Update 1 [11.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2012 Update 1 [11.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 170050727
+#define VS_VERSION_A        "Visual Studio 2012 [11.0]"
+#define VS_VERSION_W        L"Visual Studio 2012 [11.0]"
+#define VS_VERSION_N        1700
+#define VS_VERSION_F        170050727
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2012 [11.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2012 [11.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 160040219
+#define VS_VERSION_A        "Visual Studio 2010 SP1 [10.0]"
+#define VS_VERSION_W        L"Visual Studio 2010 SP1 [10.0]"
+#define VS_VERSION_N        1600
+#define VS_VERSION_F        160040219
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2010 SP1 [10.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2010 SP1 [10.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 160030319
+#define VS_VERSION_A        "Visual Studio 2010 [10.0]"
+#define VS_VERSION_W        L"Visual Studio 2010 [10.0]"
+#define VS_VERSION_N        1600
+#define VS_VERSION_F        160030319
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2010 [10.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2010 [10.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 150030729
+#define VS_VERSION_A        "Visual Studio 2008 SP1 [9.0]"
+#define VS_VERSION_W        L"Visual Studio 2008 SP1 [9.0]"
+#define VS_VERSION_N        1500
+#define VS_VERSION_F        150030729
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2008 SP1 [9.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2008 SP1 [9.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 150021022
+#define VS_VERSION_A        "Visual Studio 2008 [9.0]"
+#define VS_VERSION_W        L"Visual Studio 2008 [9.0]"
+#define VS_VERSION_N        1500
+#define VS_VERSION_F        150021022
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2008 [9.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2008 [9.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 140050727
+#define VS_VERSION_A        "Visual Studio 2005 SP1 [8.0]"
+#define VS_VERSION_W        L"Visual Studio 2005 SP1 [8.0]"
+#define VS_VERSION_N        1400
+#define VS_VERSION_F        140050727
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2005 SP1 [8.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2005 SP1 [8.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 140050320
+#define VS_VERSION_A        "Visual Studio 2005 [8.0]"
+#define VS_VERSION_W        L"Visual Studio 2005 [8.0]"
+#define VS_VERSION_N        1400
+#define VS_VERSION_F        140050320
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 2005 [8.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 2005 [8.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 13106030
+#define VS_VERSION_A        "Visual Studio .NET 2003 SP1 [7.1]"
+#define VS_VERSION_W        L"Visual Studio .NET 2003 SP1 [7.1]"
+#define VS_VERSION_N        1310
+#define VS_VERSION_F        13106030
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio .NET 2003 SP1 [7.1]"
+#else
+#define VS_VERSION_T        "Visual Studio .NET 2003 SP1 [7.1]"
+#endif
+
+#elif _MSC_FULL_VER >= 13103077
+#define VS_VERSION_A        "Visual Studio .NET 2003 [7.1]"
+#define VS_VERSION_W        L"Visual Studio .NET 2003 [7.1]"
+#define VS_VERSION_N        1310
+#define VS_VERSION_F        13103077
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio .NET 2003 [7.1]"
+#else
+#define VS_VERSION_T        "Visual Studio .NET 2003 [7.1]"
+#endif
+
+#elif _MSC_FULL_VER >= 13009466
+#define VS_VERSION_A        "Visual Studio .NET 2002 [7.0]"
+#define VS_VERSION_W        L"Visual Studio .NET 2002 [7.0]"
+#define VS_VERSION_N        1300
+#define VS_VERSION_F        13009466
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio .NET 2002 [7.0]"
+#else
+#define VS_VERSION_T        "Visual Studio .NET 2002 [7.0]"
+#endif
+
+#elif _MSC_FULL_VER >= 12008804
+#define VS_VERSION_A        "Visual Studio 6.0 SP6"
+#define VS_VERSION_W        L"Visual Studio 6.0 SP6"
+#define VS_VERSION_N        1200
+#define VS_VERSION_F        12008804
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 6.0 SP6"
+#else
+#define VS_VERSION_T        "Visual Studio 6.0 SP6"
+#endif
+
+#elif _MSC_FULL_VER >= 12008804
+#define VS_VERSION_A        "Visual Studio 6.0 SP5"
+#define VS_VERSION_W        L"Visual Studio 6.0 SP5"
+#define VS_VERSION_N        1200
+#define VS_VERSION_F        12008804
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 6.0 SP5"
+#else
+#define VS_VERSION_T        "Visual Studio 6.0 SP5"
+#endif
+
+#elif _MSC_VER >= 1200
+#define VS_VERSION_A        "Visual Studio 6.0"
+#define VS_VERSION_W        L"Visual Studio 6.0"
+#define VS_VERSION_N        1200
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 6.0"
+#else
+#define VS_VERSION_T        "Visual Studio 6.0"
+#endif
+
+#elif _MSC_VER >= 1100
+#define VS_VERSION_A        "Visual Studio 97 [5.0]"
+#define VS_VERSION_W        L"Visual Studio 97 [5.0]"
+#define VS_VERSION_N        1100
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio 97 [5.0]"
+#else
+#define VS_VERSION_T        "Visual Studio 97 [5.0]"
+#endif
+
+#elif _MSC_VER >= 1020
+#define VS_VERSION_A        "Visual C++ 4.1"
+#define VS_VERSION_W        L"Visual C++ 4.1"
+#define VS_VERSION_N        1020
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual C++ 4.1"
+#else
+#define VS_VERSION_T        "Visual C++ 4.1"
+#endif
+
+#elif _MSC_VER >= 1010
+#define VS_VERSION_A        "Visual C++ 4.1"
+#define VS_VERSION_W        L"Visual C++ 4.1"
+#define VS_VERSION_N        1010
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual C++ 4.1"
+#else
+#define VS_VERSION_T        "Visual C++ 4.1"
+#endif
+
+#elif _MSC_VER >= 1000
+#define VS_VERSION_A        "Visual C++ 4.0"
+#define VS_VERSION_W        L"Visual C++ 4.0"
+#define VS_VERSION_N        1000
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual C++ 4.0"
+#else
+#define VS_VERSION_T        "Visual C++ 4.0"
+#endif
+
+#elif _MSC_VER >= 900
+#define VS_VERSION_A        "Visual C++ 2.0"
+#define VS_VERSION_W        L"Visual C++ 2.0"
+#define VS_VERSION_N        900
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual C++ 2.0"
+#else
+#define VS_VERSION_T        "Visual C++ 2.0"
+#endif
+
+#elif _MSC_VER >= 800
+#define VS_VERSION_A        "Visual C++ 1.0"
+#define VS_VERSION_W        L"Visual C++ 1.0"
+#define VS_VERSION_N        800
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual C++ 1.0"
+#else
+#define VS_VERSION_T        "Visual C++ 1.0"
+#endif
+
+#elif _MSC_VER >= 700
+#define VS_VERSION_A        "Microsoft C/C++ 7.0"
+#define VS_VERSION_W        L"Microsoft C/C++ 7.0"
+#define VS_VERSION_N        700
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Microsoft C/C++ 7.0"
+#else
+#define VS_VERSION_T        "Microsoft C/C++ 7.0"
+#endif
+
+#elif _MSC_VER >= 600
+#define VS_VERSION_A        "Microsoft C 6.0"
+#define VS_VERSION_W        L"Microsoft C 6.0"
+#define VS_VERSION_N        600
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Microsoft C 6.0"
+#else
+#define VS_VERSION_T        "Microsoft C 6.0"
+#endif
+
+#else
+#define VS_VERSION_A        "Visual Studio"
+#define VS_VERSION_W        L"Visual Studio"
+#define VS_VERSION_N        _MSC_VER
+#define VS_VERSION_F        _MSC_FULL_VER
+#ifdef UNICODE
+#define VS_VERSION_T        L"Visual Studio"
+#else
+#define VS_VERSION_T        "Visual Studio"
+#endif
+#endif
+
+
+#endif
diff --git a/wsrm/AutomaticProductName.h b/wsrm/AutomaticProductName.h
index ff36b6f..ace421a 100644
--- a/wsrm/AutomaticProductName.h
+++ b/wsrm/AutomaticProductName.h
@@ -1,22 +1,27 @@
 #pragma once
 
+#ifndef AUTOMATICPRODUCTNAME_H
+#define AUTOMATICPRODUCTNAME_H    1
+
 #ifdef _WIN64
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"wsrm (x64 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"wsrm - Version 1.0.15.006\r\n(Build 190) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"wsrm - Version 1.0.15.011\r\n(Build 195) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "wsrm (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "wsrm - Version 1.0.15.006\r\n(Build 190) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "wsrm - Version 1.0.15.011\r\n(Build 195) - (x64 MBCS) (MSVC)\0"
 #endif
 #elif _WIN32
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"wsrm (x86 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"wsrm - Version 1.0.15.006\r\n(Build 190) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"wsrm - Version 1.0.15.011\r\n(Build 195) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "wsrm (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "wsrm - Version 1.0.15.006\r\n(Build 190) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "wsrm - Version 1.0.15.011\r\n(Build 195) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "wsrm (MSVC)\0"
-#define PRODUCT_NAME        "wsrm - Version 1.0.15.006\r\n(Build 190) - (MSVC)\0"
+#define PRODUCT_NAME        "wsrm - Version 1.0.15.011\r\n(Build 195) - (MSVC)\0"
+#endif
+
 #endif
diff --git a/wsrm/AutomaticVersionHeader.h b/wsrm/AutomaticVersionHeader.h
index 211b349..8da2556 100644
--- a/wsrm/AutomaticVersionHeader.h
+++ b/wsrm/AutomaticVersionHeader.h
@@ -5,12 +5,15 @@
 //
 //	(c) 2003 - 2024 Macallan - mailto:ian.macallan@gmail.com
 //
-//	Generated : 28/05/2024 10:34:18
+//	Generated : 06/10/2024 13:04:04
 //
 //===========================================================================================
 //
 #pragma once
 
+#ifndef AUTOMATICVERSIONHEADER_H
+#define AUTOMATICVERSIONHEADER_H    1
+
 #ifdef UNICODE
 #define PROGRAM_MAIL    L"mailto:ian.macallan@gmail.com"
 #define PROGRAM_HTTP    L"https://www.macallan.org/"
@@ -54,22 +57,22 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Tue May 28 10:34"
-#define PROGRAM_DATE_F  L"Tue May 28 10:34 2024"
+#define PROGRAM_DATE    L"Sun Oct 06 13:04"
+#define PROGRAM_DATE_F  L"Sun Oct 06 13:04 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/05/28 10:34:18"
+#define PROGRAM_TIME    L"2024/10/06 13:04:04"
 #else
-#define PROGRAM_DATE    "Tue May 28 10:34"
-#define PROGRAM_DATE_F  "Tue May 28 10:34 2024"
+#define PROGRAM_DATE    "Sun Oct 06 13:04"
+#define PROGRAM_DATE_F  "Sun Oct 06 13:04 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/05/28 10:34:18"
+#define PROGRAM_TIME    "2024/10/06 13:04:04"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"1.0.15.006"
-#define PROGRAM_INSTALL L"1.0.15006"
-#define PROGRAM_VER_NUM 10015006
-#define PROGRAM_BUILD   L"190"
+#define PROGRAM_VERSION L"1.0.15.011"
+#define PROGRAM_INSTALL L"1.0.15011"
+#define PROGRAM_VER_NUM 10015011
+#define PROGRAM_BUILD   L"195"
 #define PROGRAM_TITLE   L"wsrm"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P L"wsrm (x64 Unicode)"
@@ -77,10 +80,10 @@
 #define PROGRAM_TITLE_P L"wsrm (x86 Unicode)"
 #endif
 #else
-#define PROGRAM_VERSION "1.0.15.006"
-#define PROGRAM_INSTALL "1.0.15006"
-#define PROGRAM_VER_NUM 10015006
-#define PROGRAM_BUILD   "190"
+#define PROGRAM_VERSION "1.0.15.011"
+#define PROGRAM_INSTALL "1.0.15011"
+#define PROGRAM_VER_NUM 10015011
+#define PROGRAM_BUILD   "195"
 #define PROGRAM_TITLE   "wsrm"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P "wsrm (x64 MBCS)"
@@ -89,3 +92,5 @@
 #endif
 #endif
 
+#endif
+
diff --git a/wsrm/DiskFileInfos.cpp b/wsrm/DiskFileInfos.cpp
index 22f7955..110bc45 100644
--- a/wsrm/DiskFileInfos.cpp
+++ b/wsrm/DiskFileInfos.cpp
@@ -40,8 +40,8 @@ static WCHAR                szShortFilename [ LEN_PATHNAME ];
 static WCHAR                szOutputFilename [ LEN_PATHNAME ];
 
 //
-static WCHAR                szAttributeName [ MAX_PATH ];
-static WCHAR                szFileAttribute [ MAX_PATH ];
+static WCHAR                szAttributeName [ LEN_PATHNAME ];
+static WCHAR                szFileAttribute [ LEN_PATHNAME ];
 
 #define LEN_DUMP_LINE       128
 static WCHAR                szDumpLineW [ LEN_DUMP_LINE ];
diff --git a/wsrm/srm.cpp b/wsrm/srm.cpp
index 62e09f1..6793a99 100644
--- a/wsrm/srm.cpp
+++ b/wsrm/srm.cpp
@@ -56,6 +56,7 @@ static  WCHAR       LocaleString [ LEN_PATHNAME ];
 #define TIMES_NEW_ROMAN_W   L"Times New Roman"
 
 static WCHAR    szCurrentDirectory [ LEN_PATHNAME ];
+static WCHAR    szPrependFilename [ LEN_PATHNAME ];
 
 static WCHAR    szFillWithFile [ LEN_PATHNAME ];
 static WCHAR    szJpegext [ LEN_PATHNAME ];
@@ -604,8 +605,12 @@ BOOL readFillFile ( )
     HANDLE  hTemplateFile = NULL;
 
     //
+    //  We will hav to prepend '\\?\'
+    wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+    wcscat_s ( szPrependFilename, LEN_PATHNAME, szFillWithFile );
+
     HANDLE hFile =
-        CreateFile ( szFillWithFile, dwDesiredAccess, dwShareMode,
+        CreateFile ( szPrependFilename, dwDesiredAccess, dwShareMode,
             lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile );
     if ( hFile != INVALID_HANDLE_VALUE )
     {
@@ -831,11 +836,19 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory )
         BOOL bDeleted = FALSE;
         if ( ! bDirectory )
         {
-            bDeleted = DeleteFile ( pFullPathname );
+            //  We will hav to prepend '\\?\'
+            wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+            wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname );
+
+            bDeleted = DeleteFile ( szPrependFilename );
         }
         else
         {
-            bDeleted = RemoveDirectory ( pFullPathname );
+            //  We will hav to prepend '\\?\'
+            wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+            wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname );
+
+            bDeleted = RemoveDirectory ( szPrependFilename );
         }
 
         //
@@ -865,16 +878,16 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory )
     //
     //  Prepare Split Pathname
     WCHAR *pInputDrive = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputDrive, LEN_PATHNAME );
+    ZeroMemory ( pInputDrive, LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputDirectory = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputDirectory,LEN_PATHNAME );
+    ZeroMemory ( pInputDirectory, LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputFilename = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputFilename, LEN_PATHNAME );
+    ZeroMemory ( pInputFilename, LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputExtension = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputExtension, LEN_PATHNAME );
+    ZeroMemory ( pInputExtension, LEN_PATHNAME * sizeof(WCHAR) );
 
     //
     int iError =
@@ -941,7 +954,7 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory )
 
     //
     WCHAR *pRenameFilename = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pRenameFilename, LEN_PATHNAME );
+    ZeroMemory ( pRenameFilename, LEN_PATHNAME * sizeof(WCHAR) );
     time_t currentTime = time(NULL);
     swprintf ( pRenameFilename, LEN_PATHNAME, L"wsrm %d %d %ld", RandomCount % 1000,  rand(), ( DWORD ) currentTime );
     size_t iStart = wcslen ( pRenameFilename );
@@ -962,7 +975,7 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory )
 
     //  Set Rename Path
     WCHAR *pRenamePathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pRenamePathname, LEN_PATHNAME );
+    ZeroMemory ( pRenamePathname, LEN_PATHNAME * sizeof(WCHAR) );
     wcscpy_s ( pRenamePathname, LEN_PATHNAME, pInputDrive );
     wcscat_s ( pRenamePathname, LEN_PATHNAME, pInputDirectory );
     wcscat_s ( pRenamePathname, LEN_PATHNAME, pRenameFilename );
@@ -992,11 +1005,19 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory )
         BOOL bDeleted = FALSE;
         if ( ! bDirectory )
         {
-            bDeleted = DeleteFile ( pRenamePathname );
+            //  We will hav to prepend '\\?\'
+            wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+            wcscat_s ( szPrependFilename, LEN_PATHNAME, pRenamePathname );
+
+            bDeleted = DeleteFile ( szPrependFilename );
         }
         else
         {
-            bDeleted = RemoveDirectory ( pRenamePathname );
+            //  We will hav to prepend '\\?\'
+            wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+            wcscat_s ( szPrependFilename, LEN_PATHNAME, pRenamePathname );
+
+            bDeleted = RemoveDirectory ( szPrependFilename );
         }
 
         //
@@ -1158,8 +1179,12 @@ BOOL writeOverFile(WCHAR *pFullPathname, WIN32_FIND_DATA *pFindFileData )
         HANDLE  hTemplateFile = NULL;
 
         //
+        //  We will hav to prepend '\\?\'
+        wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" );
+        wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname );
+
         HANDLE hFile =
-            CreateFile ( pFullPathname, dwDesiredAccess, dwShareMode,
+            CreateFile ( szPrependFilename, dwDesiredAccess, dwShareMode,
                 lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile );
         if ( hFile != INVALID_HANDLE_VALUE )
         {
@@ -1397,16 +1422,16 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
 
     //
     WCHAR *pInputDrive = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputDrive, LEN_PATHNAME );
+    ZeroMemory ( pInputDrive, LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputDirectory = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputDirectory,LEN_PATHNAME );
+    ZeroMemory ( pInputDirectory,LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputFilename = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputFilename, LEN_PATHNAME );
+    ZeroMemory ( pInputFilename, LEN_PATHNAME * sizeof(WCHAR) );
 
     WCHAR *pInputExtension = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pInputExtension, LEN_PATHNAME );
+    ZeroMemory ( pInputExtension, LEN_PATHNAME * sizeof(WCHAR) );
 
     int iError =
         _wsplitpath_s (
@@ -1430,7 +1455,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
     {
         //
         WCHAR *pDirectoryPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-        ZeroMemory ( pDirectoryPathname, LEN_PATHNAME );
+        ZeroMemory ( pDirectoryPathname, LEN_PATHNAME * sizeof(WCHAR) );
         wcscpy_s ( pDirectoryPathname, LEN_PATHNAME, pInputDrive );
         wcscat_s ( pDirectoryPathname, LEN_PATHNAME, pInputDirectory );
         wcscat_s ( pDirectoryPathname, LEN_PATHNAME, L"*.*" );
@@ -1471,7 +1496,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
                     //
                     //  Set Full Pathname
                     WCHAR *pPartialPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-                    ZeroMemory ( pPartialPathname, LEN_PATHNAME );
+                    ZeroMemory ( pPartialPathname, LEN_PATHNAME * sizeof(WCHAR) );
                     wcscpy_s ( pPartialPathname, LEN_PATHNAME, pInputDrive );
                     wcscat_s ( pPartialPathname, LEN_PATHNAME, pInputDirectory );
                     wcscat_s ( pPartialPathname, LEN_PATHNAME, FindFileData.cFileName );
@@ -1479,7 +1504,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
 
                     //
                     WCHAR *pFullPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-                    ZeroMemory ( pFullPathname, LEN_PATHNAME );
+                    ZeroMemory ( pFullPathname, LEN_PATHNAME * sizeof(WCHAR) );
 
                     //
                     //  Get Full Pathname from a Paetial Pathname
@@ -1518,7 +1543,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
                         //
                         //
                         WCHAR *pSubPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-                        ZeroMemory ( pSubPathname, LEN_PATHNAME );
+                        ZeroMemory ( pSubPathname, LEN_PATHNAME * sizeof(WCHAR) );
                         wcscpy_s ( pSubPathname, LEN_PATHNAME / sizeof(WCHAR), pFullPathname );
                         wcscat_s ( pSubPathname, LEN_PATHNAME / sizeof(WCHAR), L"\\" );
                         wcscat_s ( pSubPathname, LEN_PATHNAME / sizeof(WCHAR), pInputFilename );
@@ -1556,7 +1581,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
     //
     //  For Files And Directories
     WCHAR *pSearchFilePathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-    ZeroMemory ( pSearchFilePathname, LEN_PATHNAME );
+    ZeroMemory ( pSearchFilePathname, LEN_PATHNAME * sizeof(WCHAR) );
     wcscpy_s ( pSearchFilePathname, LEN_PATHNAME, pInputDrive );
     wcscat_s ( pSearchFilePathname, LEN_PATHNAME, pInputDirectory );
     wcscat_s ( pSearchFilePathname, LEN_PATHNAME, pInputFilename );
@@ -1592,7 +1617,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
             //
             //  Set Full Pathname
             WCHAR *pPartialPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-            ZeroMemory ( pPartialPathname, LEN_PATHNAME );
+            ZeroMemory ( pPartialPathname, LEN_PATHNAME * sizeof(WCHAR) );
             wcscpy_s ( pPartialPathname, LEN_PATHNAME, pInputDrive );
             wcscat_s ( pPartialPathname, LEN_PATHNAME, pInputDirectory );
             wcscat_s ( pPartialPathname, LEN_PATHNAME, FindFileData.cFileName );
@@ -1601,7 +1626,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
 
             //
             WCHAR *pFullPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-            ZeroMemory ( pFullPathname, LEN_PATHNAME );
+            ZeroMemory ( pFullPathname, LEN_PATHNAME * sizeof(WCHAR) );
 
             //
             //  Get Full Pathname from Partial Pathname
@@ -1727,7 +1752,7 @@ BOOL deletePath ( const WCHAR *lpPathname, int iLevel )
                         //
                         //
                         WCHAR *pSubPathname = ( WCHAR * ) malloc ( LEN_PATHNAME * sizeof(WCHAR) );
-                        ZeroMemory ( pSubPathname, LEN_PATHNAME );
+                        ZeroMemory ( pSubPathname, LEN_PATHNAME * sizeof(WCHAR) );
                         wcscpy_s ( pSubPathname, LEN_PATHNAME / sizeof(WCHAR), pFullPathname );
                         wcscat_s ( pSubPathname, LEN_PATHNAME / sizeof(WCHAR), L"\\*.*" );
 
diff --git a/wsrm/strstr.cpp b/wsrm/strstr.cpp
index 800381c..2277cd6 100644
--- a/wsrm/strstr.cpp
+++ b/wsrm/strstr.cpp
@@ -26,6 +26,8 @@
 #include <Shlwapi.h>
 #include <Shellapi.h>
 
+#include "AutomaticCompilerVersion.h"
+
 #pragma comment (lib, "Shlwapi.lib")
 #pragma comment (lib, "advapi32.lib")
 #pragma comment (lib, "Shell32.lib")
@@ -5292,6 +5294,10 @@ void PrintRealVersionW (int iWidth)
                 memcpy ( ModuleText, pBufferInfo, iBufferLen * sizeof(WCHAR) );
                 PrintDirectW ( L"%*s : %s\n", iWidth, L"Description", ModuleText );
             }
+
+            ZeroMemory ( ModuleText, sizeof(ModuleText) );
+            swprintf_s ( ModuleText, _wsizeof(ModuleText), L"%s (%d)", VS_VERSION_W, _MSC_FULL_VER );
+            PrintDirectW ( L"%*s : %s\n", iWidth, L"Compiler", ModuleText );
         }
 
         if ( pData != NULL )
@@ -5377,7 +5383,7 @@ void PrintRealVersionA (int iWidth)
                 PrintDirectA ( "%*s : %s\n", iWidth, "Web Site", ModuleText );
             }
 
-            sprintf_s ( ModuleKey, _wsizeof ( ModuleKey ), "\\StringFileInfo\\%08x\\Comments", dwKey );
+            sprintf_s ( ModuleKey, sizeof ( ModuleKey ), "\\StringFileInfo\\%08x\\Comments", dwKey );
             bResult = VerQueryValueA ( pData, ModuleKey, &pBufferInfo, &iBufferLen );
             if ( bResult )
             {
@@ -5394,6 +5400,10 @@ void PrintRealVersionA (int iWidth)
                 memcpy ( ModuleText, pBufferInfo, iBufferLen * sizeof(char) );
                 PrintDirectA ( "%*s : %s\n", iWidth, "Description", ModuleText );
             }
+
+            ZeroMemory ( ModuleText, sizeof(ModuleText) );
+            sprintf_s ( ModuleText, sizeof(ModuleText), "%s (%d)", VS_VERSION_A, _MSC_FULL_VER );
+            PrintDirectA ( "%*s : %s\n", iWidth, "Compiler", ModuleText );
         }
 
         if ( pData != NULL )
diff --git a/wsrm/wsrm.rc b/wsrm/wsrm.rc
index 015e0fe..09fddf5 100644
--- a/wsrm/wsrm.rc
+++ b/wsrm/wsrm.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,15,006
- PRODUCTVERSION 1,0,15,006
+ FILEVERSION 1,0,15,011
+ PRODUCTVERSION 1,0,15,011
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,15 +70,15 @@ BEGIN
             VALUE "Comments", "mailto:ian.macallan@gmail.com\0"
             VALUE "CompanyName", "Macallan (c)\0"
             VALUE "FileDescription", "wsrm - (MSVC)\0"
-            VALUE "FileVersion", "1.0.15.006\0"
+            VALUE "FileVersion", "1.0.15.011\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Tue May 28 10:34, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Sun Oct 06 13:04, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "190\0"
+            VALUE "PrivateBuild", "195\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "1.0.15.006\0"
-            VALUE "SpecialBuild", "190\0"
+            VALUE "ProductVersion", "1.0.15.011\0"
+            VALUE "SpecialBuild", "195\0"
         END
     END
     BLOCK "VarFileInfo"