diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d24c8c1f..0a83240f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,111 @@ cppcheck:
     paths:
       - cppcheck.log
 
+
+#VS2015-64-bit-shared-apps:
+#  variables:
+#    BUILD_PLATFORM: "VS2015"
+#    ARCHITECTURE:   "x64"
+#    SHARED:         "TRUE"
+#    APPS:           "ON"
+#  script: "CI\\Windows.bat"
+#  tags:
+#    - VS2015
+#  artifacts:
+#    paths:
+#      - build-release/*.exe
+      
+VS2017-64-bit-shared-no-apps:
+  variables:
+    BUILD_PLATFORM: "VS2017"
+    ARCHITECTURE:   "x64"
+    SHARED:         "TRUE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2017
+  artifacts:
+    paths:
+      - build-release/*.exe
+
+#VS2015-32-bit-shared-apps:
+#  variables:
+#    BUILD_PLATFORM: "VS2015"
+#    ARCHITECTURE:   "x32"
+#    SHARED:         "TRUE"
+#    APPS:           "ON"
+#  script: "CI\\Windows.bat"
+#  tags:
+#    - VS2015
+#  artifacts:
+#    paths:
+#      - build-release/*.exe
+
+VS2017-32-bit-shared-no-apps:
+  variables:
+    BUILD_PLATFORM: "VS2017"
+    ARCHITECTURE:   "x32"
+    SHARED:         "TRUE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2017
+  artifacts:
+    paths:
+      - build-release/*.exe
+      
+#VS2015-64-bit-static-apps:
+#  variables:
+#    BUILD_PLATFORM: "VS2015"
+#    ARCHITECTURE:   "x64"
+#    SHARED:         "FALSE"
+#    APPS:           "ON"
+#  script: "CI\\Windows.bat"
+#  tags:
+#    - VS2015
+#  artifacts:
+#    paths:
+#      - build-release/*.exe
+
+VS2017-64-bit-static-no-apps:
+  variables:
+    BUILD_PLATFORM: "VS2017"
+    ARCHITECTURE:   "x64"
+    SHARED:         "FALSE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2017
+  artifacts:
+    paths:
+      - build-release/*.exe
+
+#VS2015-32-bit-static-apps:
+#  variables:
+#    BUILD_PLATFORM: "VS2015"
+#    ARCHITECTURE:   "x32"
+#    SHARED:         "FALSE"
+#    APPS:           "ON"
+#  script: "CI\\Windows.bat"
+#  tags:
+#    - VS2015
+#  artifacts:
+#    paths:
+#      - build-release/*.exe
+
+VS2017-32-bit-static-no-apps:
+  variables:
+    BUILD_PLATFORM: "VS2017"
+    ARCHITECTURE:   "x32"
+    SHARED:         "FALSE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2017
+  artifacts:
+    paths:
+      - build-release/*.exe
+	   
 VS2015-64-bit-shared-apps:
   variables:
     BUILD_PLATFORM: "VS2015"
diff --git a/CI/Windows.bat b/CI/Windows.bat
index b5402dd2..e7e9a187 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -69,6 +69,20 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
 
 ) 
 
+IF "%BUILD_PLATFORM%" == "VS2017" (
+    set LIBPATH=E:\libs\VS2017
+    set GTESTVERSION=gtest-1.7.0
+    set GENERATOR=Visual Studio 15%ARCH_VS%
+    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 15.0\Common7\IDE\devenv.com"
+
+    set QT_VERSION=
+    IF "%ARCHITECTURE%" == "x64" (
+      set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
+      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
+    )
+
+) 
+
 
 IF "%APPS%" == "ON" (
   set STRING_APPS=