diff --git a/.travis.yml b/.travis.yml
index 06e4344..ebfae6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
-dist: trusty
+dist: xenial-xerus
 language: cpp
 compiler:
   - gcc-4.8
 before_script:
   - sudo apt-get install  -y gcc-4.8 g++-4.8 libopencv-dev libboost1.55-all-dev cmake
-  - wget https://download.affectiva.com/linux/affdex-cpp-sdk-3.1-396-linux-64bit.tar.gz -O /tmp/affdex-sdk.tar.gz
+  - wget https://download.affectiva.com/linux/https://download.affectiva.com/linux/affdex-cpp-sdk-3.3-40-ubuntu-xenial-xerus-x86_64bit.tar.gz -O /tmp/affdex-sdk.tar.gz
   - mkdir /tmp/affdex-sdk
   - tar -xzvf /tmp/affdex-sdk.tar.gz -C /tmp/affdex-sdk
   - mkdir build
diff --git a/affdex-win-samples.sln b/affdex-win-samples.sln
index 653a244..d210858 100644
--- a/affdex-win-samples.sln
+++ b/affdex-win-samples.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv-webcam-demo", "opencv-webcam-demo\opencv-webcam-demo.vcxproj", "{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}"
 EndProject
@@ -13,7 +13,9 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.ActiveCfg = Release|x64
+		{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.Build.0 = Release|x64
 		{5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.ActiveCfg = Release|x64
+		{5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index ec6656c..f83f9ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,21 +2,27 @@ version: 1.0.{build}
 image:
 - Visual Studio 2013
 - Visual Studio 2015
+configuration: Release
+platform: x64
 before_build:
 - cmd: >-
-    appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.1-368-win64.exe -FileName AffdexSDK-3.1-368-win64.exe
+    appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.4.1-575-win64.exe -FileName AffdexSDK-win64.exe
 
-    AffdexSDK-3.1-368-win64.exe /S
+    AffdexSDK-win64.exe /S
 
     nuget restore affdex-win-samples.sln
+
 build:
+  project: affdex-win-samples.sln
   parallel: true
   verbosity: detailed
 artifacts:
-- path: '\x64\Release'
+- path: 'x64\Release'
 deploy:
 - provider: GitHub
-  release: 3.1
+  release: 3.4
+  artifact: 'x64\Release.zip'
   auth_token:
     secure: sjCE8t4b8ME8j2D6e0kRpNib8STOljgGVPdexj4n0gXU/nYxFkdaI9GXRukRHri5
-  artifact: Release.zip
+  on:
+    branch: master                 # release from master branch only
diff --git a/opencv-webcam-demo/opencv-webcam-demo.vcxproj b/opencv-webcam-demo/opencv-webcam-demo.vcxproj
index 3911b9a..f89bafb 100644
--- a/opencv-webcam-demo/opencv-webcam-demo.vcxproj
+++ b/opencv-webcam-demo/opencv-webcam-demo.vcxproj
@@ -44,18 +44,18 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\Program Files\Affectiva\Affdex SDK\include;../common/;%(AdditionalDependencies)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Program Files\Affectiva\AffdexSDK\include;../common/;%(AdditionalDependencies)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)"
-xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Command>
+      <Command>xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)"
+xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -116,4 +116,4 @@ xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Co
     <Error Condition="!Exists('..\packages\opencv3.1.redist.1.0\build\native\opencv3.1.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\opencv3.1.redist.1.0\build\native\opencv3.1.redist.targets'))" />
     <Error Condition="!Exists('..\packages\opencv3.1.1.0\build\native\opencv3.1.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\opencv3.1.1.0\build\native\opencv3.1.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/video-demo/video-demo.vcxproj b/video-demo/video-demo.vcxproj
index ef1f29e..104b09e 100644
--- a/video-demo/video-demo.vcxproj
+++ b/video-demo/video-demo.vcxproj
@@ -44,19 +44,19 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\Program Files\Affectiva\Affdex SDK\include;../common;%(AdditionalDependencies)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Program Files\Affectiva\AffdexSDK\include;../common;%(AdditionalDependencies)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)"
-xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)"
-xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Command>
+      <Command>xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)"
+xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)"
+xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -117,4 +117,4 @@ xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Co
     <Error Condition="!Exists('..\packages\opencv3.1.redist.1.0\build\native\opencv3.1.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\opencv3.1.redist.1.0\build\native\opencv3.1.redist.targets'))" />
     <Error Condition="!Exists('..\packages\opencv3.1.1.0\build\native\opencv3.1.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\opencv3.1.1.0\build\native\opencv3.1.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>