diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc85f350..796d5b1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,6 +182,31 @@ EgwProxy.Icoel:build:
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
 
+EgwProxy.MultiCncLib:build:
+ stage: build
+ tags:
+   - win
+ variables:
+  APP_NAME: EgwProxy.MultiCncLib
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+   - *version-fix
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
+
+EgwProxy.OsaiCncLib:build:
+ stage: build
+ tags:
+   - win
+ variables:
+  APP_NAME: EgwProxy.OsaiCncLib
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+   - *version-fix
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
 
 # --------------------------------
 # STAGING: (nuget beta)
@@ -207,7 +232,51 @@ EgwProxy.Icoel:build:staging:
     - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
     - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
     - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
- 
+
+EgwProxy.MultiCncLib:build:staging:
+ stage: staging
+ needs: ["EgwProxy.MultiCncLib:build"]
+ tags:
+   - win
+ variables:
+   CONFIG: Debug
+   APP_NAME: EgwProxy.MultiCncLib
+ except:
+   refs:
+     - main
+     - master
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+   - *version-fix
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
+    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
+    - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
+    - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
+
+EgwProxy.OsaiCncLib:build:staging:
+ stage: staging
+ needs: ["EgwProxy.OsaiCncLib:build"]
+ tags:
+   - win
+ variables:
+   CONFIG: Debug
+   APP_NAME: EgwProxy.OsaiCncLib
+ except:
+   refs:
+     - main
+     - master
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+   - *version-fix
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
+    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
+    - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
+    - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
+
 # --------------------------------
 # RELEASE
 # --------------------------------
diff --git a/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
index ba94fbdc..251e1244 100644
--- a/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
+++ b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
@@ -204,6 +204,9 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\VersGen\VersGen.vb">
+      <Link>VersGen.vb</Link>
+    </Compile>
     <Compile Include="App\App.Native.Ini.vb" />
     <Compile Include="CNC\CNC.FANUC\CNC.FANUC.vb" />
     <Compile Include="CNC\CNC.FANUC\_\CNC.FANUC.Err.vb" />
diff --git a/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb
index 2fc16abb..61167e3d 100644
--- a/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb	
+++ b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb	
@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("EgwProxy.MultiCncLib")> 
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("SteamWare")>
+<Assembly: AssemblyTitle("EgwProxy.MultiCncLib")>
+<Assembly: AssemblyDescription("Proxy class for accessing multiple CNC (FANUC, SIEMENS, ...)")>
+'<Assembly: AssemblyCompany("EgalWare")>
 <Assembly: AssemblyProduct("EgwProxy.MultiCncLib")>
-<Assembly: AssemblyCopyright("Copyright ©2007-2017")>
+'<Assembly: AssemblyCopyright("Copyright © 2006 EgalWare")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 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.0.0.0")>
+'<Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb b/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb
index b0e7691c..63714685 100644
--- a/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb	
+++ b/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb	
@@ -9,9 +9,9 @@ Imports System.Runtime.InteropServices
 ' Review the values of the assembly attributes
 
 <Assembly: AssemblyTitle("EgwProxy.OsaiCncLib")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Proxy class for accessing OSAI CNC (Open, CNDEX, VB6)")>
 '<Assembly: AssemblyCompany("EgalWare")>
-<Assembly: AssemblyProduct("OsaiCncLib")>
+<Assembly: AssemblyProduct("EgwProxy.OsaiCncLib")>
 '<Assembly: AssemblyCopyright("Copyright © 2006 EgalWare")>
 <Assembly: AssemblyTrademark("")>