diff --git a/Include/OniCAPI.h b/Include/OniCAPI.h
index aea426d49..8daaadfc5 100644
--- a/Include/OniCAPI.h
+++ b/Include/OniCAPI.h
@@ -106,6 +106,9 @@ ONI_C_API OniStatus oniStreamStart(OniStreamHandle stream);
 /** Stop generating data from the stream. */
 ONI_C_API void oniStreamStop(OniStreamHandle stream);
 
+/** Send to handler the current frame held by the stream without any side effect or blocking. For use in an onNewFrame() callback and after a successful oniWaitForStreams(). */
+ONI_C_API OniStatus oniStreamPeekFrame(OniStreamHandle stream, OniProcessFrameCallback handler, void* pCookie);
+
 /** Get the next frame from the stream. This function is blocking until there is a new frame from the stream. For timeout, use oniWaitForStreams() first */
 ONI_C_API OniStatus oniStreamReadFrame(OniStreamHandle stream, OniFrame** pFrame);
 
diff --git a/Include/OniCTypes.h b/Include/OniCTypes.h
index 122469495..b2a9f9d9a 100644
--- a/Include/OniCTypes.h
+++ b/Include/OniCTypes.h
@@ -113,6 +113,7 @@ typedef struct
 } OniFrame;
 
 typedef void (ONI_CALLBACK_TYPE* OniNewFrameCallback)(OniStreamHandle stream, void* pCookie);
+typedef void (ONI_CALLBACK_TYPE* OniProcessFrameCallback)(OniFrame* frame, void* pCookie);
 typedef void (ONI_CALLBACK_TYPE* OniGeneralCallback)(void* pCookie);
 typedef void (ONI_CALLBACK_TYPE* OniDeviceInfoCallback)(const OniDeviceInfo* pInfo, void* pCookie);
 typedef void (ONI_CALLBACK_TYPE* OniDeviceStateCallback)(const OniDeviceInfo* pInfo, OniDeviceState deviceState, void* pCookie);
diff --git a/Include/OniVersion.h b/Include/OniVersion.h
index 7aa13ed58..c11de5aa7 100644
--- a/Include/OniVersion.h
+++ b/Include/OniVersion.h
@@ -21,9 +21,9 @@
 #include "OniPlatform.h"
 
 #define ONI_VERSION_MAJOR	2
-#define ONI_VERSION_MINOR	2
-#define ONI_VERSION_MAINTENANCE	0
-#define ONI_VERSION_BUILD	33
+#define ONI_VERSION_MINOR	3
+#define ONI_VERSION_MAINTENANCE	2
+#define ONI_VERSION_BUILD	0
 
 /** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define ONI_BRIEF_VERSION_STRING \
diff --git a/Include/OpenNI.h b/Include/OpenNI.h
index 52324b4eb..9b0e4f561 100644
--- a/Include/OpenNI.h
+++ b/Include/OpenNI.h
@@ -275,10 +275,10 @@ class VideoMode : private OniVideoMode
 	@param [in] resolutionX Desired new horizontal resolution in pixels.
 	@param [in] resolutionY Desired new vertical resolution in pixels.
 	*/
-	void setResolution(int resolutionX, int resolutionY)
+	void setResolution(int _resolutionX, int _resolutionY)
 	{
-		this->resolutionX = resolutionX;
-		this->resolutionY = resolutionY;
+		this->resolutionX = _resolutionX;
+		this->resolutionY = _resolutionY;
 	}
 
 	/**
@@ -287,7 +287,7 @@ class VideoMode : private OniVideoMode
 	video modes.
 	@param [in] fps Desired new frame rate, measured in frames per second.
 	*/
-	void setFps(int fps) { this->fps = fps; }
+	void setFps(int _fps) { this->fps = _fps; }
 
 	friend class SensorInfo;
 	friend class VideoStream;
@@ -596,11 +596,12 @@ class VideoFrameRef
 	/** @internal */
 	void _setFrame(OniFrame* pFrame)
 	{
-		setReference(pFrame);
 		if (pFrame != NULL)
 		{
 			oniFrameAddRef(pFrame);
 		}
+		release();
+		m_pFrame = pFrame;
 	}
 
 	/** @internal */
@@ -611,11 +612,10 @@ class VideoFrameRef
 
 private:
 	friend class VideoStream;
-	inline void setReference(OniFrame* pFrame)
+	static void ONI_CALLBACK_TYPE setReference(OniFrame* pFrame, void* pCookie)
 	{
-		// Initial - don't addref. This is the reference from OpenNI
-		release();
-		m_pFrame = pFrame;
+		VideoFrameRef* pRef = (VideoFrameRef*)pCookie;
+		pRef->_setFrame(pFrame);
 	}
 
 	OniFrame* m_pFrame; // const!!?
@@ -800,8 +800,26 @@ class VideoStream
 	}
 
 	/**
-	Read the next frame from this video stream, delivered as a @ref VideoFrameRef.  This is the primary
-	method for manually obtaining frames of video data.  
+	Get the current frame from this video stream without any side effect or blocking, delivered as a @ref VideoFrameRef.
+	Call this after using @ref OpenNI::waitForAnyStream() to wait for new frames from several streams.
+	Alternatively, use @ref VideoStream::Listener to implement an event driven architecture
+	and call this in the callback method to get the frame from the stream.
+
+	@param [out] pFrame Pointer to a @ref VideoFrameRef object to hold the reference to the new frame.
+	@returns Status code to indicated success or failure of this function.
+	*/
+	Status peekFrame(VideoFrameRef* pFrameRef)
+	{
+		if (!isValid())
+		{
+			return STATUS_ERROR;
+		}
+
+		return (Status)oniStreamPeekFrame(m_stream, VideoFrameRef::setReference, pFrameRef);
+	}
+
+	/**
+	Read the next frame from this video stream, delivered as a @ref VideoFrameRef.
 	If no new frame is available, the call will block until one is available.
 	To avoid blocking, use @ref VideoStream::Listener to implement an event driven architecture.  Another
 	alternative is to use @ref OpenNI::waitForAnyStream() to wait for new frames from several streams.
@@ -809,7 +827,7 @@ class VideoStream
 	@param [out] pFrame Pointer to a @ref VideoFrameRef object to hold the reference to the new frame.
 	@returns Status code to indicated success or failure of this function.
 	*/
-	Status readFrame(VideoFrameRef* pFrame)
+	Status readFrame(VideoFrameRef* pFrameRef)
 	{
 		if (!isValid())
 		{
@@ -819,7 +837,7 @@ class VideoStream
 		OniFrame* pOniFrame;
 		Status rc = (Status)oniStreamReadFrame(m_stream, &pOniFrame);
 
-		pFrame->setReference(pOniFrame);
+		VideoFrameRef::setReference(pOniFrame, pFrameRef);
 		return rc;
 	}
 
diff --git a/Packaging/Harvest.py b/Packaging/Harvest.py
index 4ce9ed269..e4856594f 100755
--- a/Packaging/Harvest.py
+++ b/Packaging/Harvest.py
@@ -54,7 +54,7 @@ def copySharedObject(self, sourceDir, name, targetDir):
         elif self.osName == 'Darwin':
             shutil.copy(os.path.join(sourceDir, 'lib' + name + '.dylib'), targetDir)
         else:
-            raise 'Unsupported platform!'
+            raise Execption('Unsupported platform!')
             
     def copyExecutable(self, sourceDir, name, targetDir):
         if self.osName == 'Windows':
@@ -335,7 +335,7 @@ def run(self):
             shutil.copy(os.path.join(self.rootDir, 'Packaging', 'Linux', 'primesense-usb.rules'), self.outDir)
 
 if len(sys.argv) < 3:
-    print 'Usage: ' + sys.argv[0] + ' <OutDir> <x86|x64|Arm>'
+    print('Usage: ' + sys.argv[0] + ' <OutDir> <x86|x64|Arm>')
     exit(1)
     
 rootDir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
diff --git a/Packaging/Install/Includes/Variables.wxi b/Packaging/Install/Includes/Variables.wxi
index 06d017416..b76dcdf07 100644
--- a/Packaging/Install/Includes/Variables.wxi
+++ b/Packaging/Install/Includes/Variables.wxi
@@ -5,13 +5,13 @@
   It's not enough to just include newer files.
   -->
   <?define MajorVersion=2?>
-  <?define MinorVersion=2?>
+  <?define MinorVersion=3?>
   <?define MaintenanceVersion=0?>
   <!-- BuildVersion is NOT used by WiX in the upgrade procedure -->
-  <?define BuildVersion=33?>
+  <?define BuildVersion=2?>
   <!-- Full version number to display -->
   <?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.MaintenanceVersion).$(var.BuildVersion)"?>
-  <?define VersionName="2.2"?>
+  <?define VersionName="2.3"?>
 
   <!--
   Path to the resources directory. resources don't really need to be included
diff --git a/Packaging/Install/Install.wixproj b/Packaging/Install/Install.wixproj
index 933565a40..4b31fa033 100644
--- a/Packaging/Install/Install.wixproj
+++ b/Packaging/Install/Install.wixproj
@@ -8,7 +8,7 @@
     <ProductVersion>3.5</ProductVersion>
     <ProjectGuid>{baeb9c48-562c-4d56-a6cd-18932265480a}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>OpenNI-Windows-$(Platform)-2.2</OutputName>
+    <OutputName>OpenNI-Windows-$(Platform)-2.3</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
diff --git a/Packaging/ReleaseVersion.py b/Packaging/ReleaseVersion.py
index e2fdf5fbe..3075e7e82 100755
--- a/Packaging/ReleaseVersion.py
+++ b/Packaging/ReleaseVersion.py
@@ -32,7 +32,7 @@
 import UpdateVersion
 
 if len(sys.argv) < 2 or sys.argv[1] in ('-h','--help'):
-    print "usage: " + sys.argv[0] + " <x86|x64|Arm|android> [UpdateVersion]"
+    print("usage: " + sys.argv[0] + " <x86|x64|Arm|android> [UpdateVersion]")
     sys.exit(1)
     
 plat = sys.argv[1]
@@ -89,14 +89,14 @@ def calc_jobs_number():
 
 # Create installer
 strVersion = UpdateVersion.getVersionName()
-print "Creating installer for OpenNI " + strVersion + " " + plat
+print("Creating installer for OpenNI " + strVersion + " " + plat)
 finalDir = "Final"
 if not os.path.isdir(finalDir):
     os.mkdir(finalDir)
     
 if plat == 'android':
     if not 'NDK_ROOT' in os.environ:
-        print 'Please define NDK_ROOT!'
+        print('Please define NDK_ROOT!')
         sys.exit(2)
 
     ndkDir = os.environ['NDK_ROOT']
@@ -115,7 +115,7 @@ def calc_jobs_number():
     shutil.copy('../Application.mk', buildDir + '/jni')
     rc = subprocess.call([ ndkDir + '/ndk-build', '-C', buildDir, '-j8' ])
     if rc != 0:
-        print 'Build failed!'
+        print('Build failed!')
         sys.exit(3)
 
     finalFile = finalDir + '/' + outputDir + '.tar'
@@ -174,12 +174,12 @@ def calc_jobs_number():
     os.remove(origDir + '/build.release.' + plat + '.log')
     
 else:
-    print "Unknown OS"
+    print("Unknown OS")
     sys.exit(2)
     
 # also copy Release Notes and CHANGES documents
 shutil.copy('../ReleaseNotes.txt', finalDir)
 shutil.copy('../CHANGES.txt', finalDir)
     
-print "Installer can be found under: " + finalDir
-print "Done"
+print("Installer can be found under: " + finalDir)
+print("Done")
diff --git a/Packaging/UpdateVersion.py b/Packaging/UpdateVersion.py
index 87358c4c6..e891f2b88 100755
--- a/Packaging/UpdateVersion.py
+++ b/Packaging/UpdateVersion.py
@@ -26,9 +26,9 @@
 from datetime import date
 
 VERSION_MAJOR = 2
-VERSION_MINOR = 2
+VERSION_MINOR = 3
 VERSION_MAINTENANCE = 0
-VERSION_BUILD = 33
+VERSION_BUILD = 0
 
 def getVersionString():
     return str(VERSION_MAJOR) + "." + str(VERSION_MINOR) + "." + str(VERSION_MAINTENANCE) + "." + str(VERSION_BUILD)
@@ -58,7 +58,7 @@ def update():
         print ("Illegal build version")
         sys.exit()
 
-    print "Going to update files to version: " + getVersionString()
+    print ("Going to update files to version: " + getVersionString())
 
     update_self_defs("./UpdateVersion.py")
     update_src_ver_defs("../Include/OniVersion.h")
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index c95a96edc..ef687edf0 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,5 @@
-OpenNI 2.2.0 Build 33
-November 12 2013
+OpenNI 2.3.0 Build 2
+August 30 2022
 
 Minimum Requirements:
 ---------------------
diff --git a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
index fe63dbfc5..01c10b702 100644
--- a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
+++ b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/EventBasedRead/EventBasedRead.vcxproj b/Samples/EventBasedRead/EventBasedRead.vcxproj
index f67db7a33..23f1d3764 100644
--- a/Samples/EventBasedRead/EventBasedRead.vcxproj
+++ b/Samples/EventBasedRead/EventBasedRead.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/MWClosestPoint/MWClosestPoint.vcxproj b/Samples/MWClosestPoint/MWClosestPoint.vcxproj
index 74cafe76d..0468e966d 100644
--- a/Samples/MWClosestPoint/MWClosestPoint.vcxproj
+++ b/Samples/MWClosestPoint/MWClosestPoint.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
index 063ec3771..feb34533c 100644
--- a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
+++ b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
index d021c0d05..8ef7839ed 100644
--- a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
+++ b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
index 15887ec68..3ac748ea4 100644
--- a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
+++ b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/SimpleRead/SimpleRead.vcxproj b/Samples/SimpleRead/SimpleRead.vcxproj
index de3942f1d..a6c6a4827 100644
--- a/Samples/SimpleRead/SimpleRead.vcxproj
+++ b/Samples/SimpleRead/SimpleRead.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Samples/SimpleViewer/SimpleViewer.vcxproj b/Samples/SimpleViewer/SimpleViewer.vcxproj
index d693a1d2f..29b177e12 100644
--- a/Samples/SimpleViewer/SimpleViewer.vcxproj
+++ b/Samples/SimpleViewer/SimpleViewer.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Core/OniContext.cpp b/Source/Core/OniContext.cpp
index 153c7c6e7..943dacf58 100644
--- a/Source/Core/OniContext.cpp
+++ b/Source/Core/OniContext.cpp
@@ -26,7 +26,7 @@
 static const char* ONI_CONFIGURATION_FILE = "OpenNI.ini";
 static const char* ONI_DEFAULT_DRIVERS_REPOSITORY = "OpenNI2" XN_FILE_DIR_SEP "Drivers";
 
-#define XN_MASK_ONI_CONTEXT "OniContext"
+#define XN_MASK_ONI_CONTEXT "ONI"
 
 ONI_NAMESPACE_IMPLEMENTATION_BEGIN
 
@@ -420,11 +420,11 @@ OniStatus Context::deviceOpen(const char* uri, const char* mode, OniDeviceHandle
 		{
 			if ((*iter)->tryDevice(deviceURI))
 			{
-				for (xnl::List<Device*>::Iterator iter = m_devices.Begin(); iter != m_devices.End(); ++iter)
+				for (xnl::List<Device*>::Iterator devIter = m_devices.Begin(); devIter != m_devices.End(); ++devIter)
 				{
-					if (xnOSStrCmp((*iter)->getInfo()->uri, deviceURI) == 0)
+					if (xnOSStrCmp((*devIter)->getInfo()->uri, deviceURI) == 0)
 					{
-						pMyDevice = *iter;
+						pMyDevice = *devIter;
 						break;
 					}
 				}
@@ -624,6 +624,20 @@ OniStatus Context::streamDestroy(VideoStream* pStream)
 	return rc;
 }
 
+OniStatus Context::peekFrame(OniStreamHandle stream, OniProcessFrameCallback handler, void* pCookie)
+{
+    if (!stream || !stream->pStream)
+    {
+		return ONI_STATUS_ERROR;
+	}
+
+    VideoStream* pStream = ((_OniStream*)stream)->pStream;
+    pStream->lockFrame();
+    handler(pStream->peekFrame(), pCookie);
+    pStream->unlockFrame();
+    return ONI_STATUS_OK;
+}
+
 OniStatus Context::readFrame(OniStreamHandle stream, OniFrame** pFrame)
 {
 	// Make sure frame is available.
@@ -670,6 +684,7 @@ OniStatus Context::waitForStreams(OniStreamHandle* pStreams, int streamCount, in
 	{
 		if (pStreams[i] == NULL)
 		{
+            streamsList[i] = NULL;
 			continue;
 		}
 
@@ -740,16 +755,22 @@ OniStatus Context::waitForStreams(OniStreamHandle* pStreams, int streamCount, in
 				timeToWait = timeout - (int)passedTime;
 			else
 				timeToWait = 0;
+			xnLogVerbose(XN_MASK_ONI_CONTEXT, "Wait %d for event %lx", timeToWait, reinterpret_cast<size_t>(hEvent));
 		}
+		else
+			xnLogVerbose(XN_MASK_ONI_CONTEXT, "Wait for event %lx", reinterpret_cast<size_t>(hEvent));
 	} while (XN_STATUS_OK == xnOSWaitEvent(hEvent, timeToWait));
 	
 	xnOSStopTimer(&workTimer);
+	releaseThreadEvent();
 
 	if (oldestIndex != -1)
 	{
+		xnLogVerbose(XN_MASK_ONI_CONTEXT, "Stream index %d", oldestIndex);
 		return ONI_STATUS_OK;
 	}
 
+	xnLogVerbose(XN_MASK_ONI_CONTEXT, "Timeout");
 	m_errorLogger.Append("waitForStreams: timeout reached");
 	return ONI_STATUS_TIME_OUT;
 }
@@ -1030,6 +1051,7 @@ void Context::onNewFrame()
 	m_cs.Lock();
 	for (xnl::Hash<XN_THREAD_ID, XN_EVENT_HANDLE>::Iterator it = m_waitingThreads.Begin(); it != m_waitingThreads.End(); ++it)
 	{
+		xnLogVerbose(XN_MASK_ONI_CONTEXT, "Set event %lx", reinterpret_cast<size_t>(it->Value()));
 		xnOSSetEvent(it->Value());
 	}
 	m_cs.Unlock();
@@ -1049,15 +1071,31 @@ XN_EVENT_HANDLE Context::getThreadEvent()
 
 	m_cs.Lock();
 	
-	if (XN_STATUS_OK != m_waitingThreads.Get(tid, hEvent))
+	if (XN_STATUS_OK != m_knownThreads.Get(tid, hEvent))
 	{
 		xnOSCreateEvent(&hEvent, FALSE);
-		m_waitingThreads.Set(tid, hEvent);
+		m_knownThreads.Set(tid, hEvent);
 	}
+	m_waitingThreads.Set(tid, hEvent);
 
 	m_cs.Unlock();
 
 	return hEvent;
 }
 
+void Context::releaseThreadEvent()
+{
+	XN_THREAD_ID tid;
+	xnOSGetCurrentThreadID(&tid);
+
+	m_cs.Lock();
+	auto pEntry = m_waitingThreads.Find(tid);
+	if (m_waitingThreads.End() != pEntry)
+	{
+		m_waitingThreads.Remove(pEntry);
+	}
+
+	m_cs.Unlock();
+}
+
 ONI_NAMESPACE_IMPLEMENTATION_END
diff --git a/Source/Core/OniContext.h b/Source/Core/OniContext.h
index d9ee2afbf..c0ca940af 100644
--- a/Source/Core/OniContext.h
+++ b/Source/Core/OniContext.h
@@ -81,6 +81,7 @@ class Context
 
 	const OniSensorInfo* getSensorInfo(OniStreamHandle stream);
 
+	OniStatus peekFrame(OniStreamHandle stream, OniProcessFrameCallback handler, void* pCookie);
 	OniStatus readFrame(OniStreamHandle stream, OniFrame** pFrame);
 
 	void frameRelease(OniFrame* pFrame);
@@ -115,6 +116,7 @@ class Context
 	XnStatus loadLibraries(const char* directoryName);
 	void onNewFrame();
 	XN_EVENT_HANDLE getThreadEvent();
+	void releaseThreadEvent();
 	static void XN_CALLBACK_TYPE newFrameCallback(void* pCookie);
 
 	FrameManager m_frameManager;
@@ -131,6 +133,7 @@ class Context
     xnl::List<oni::implementation::Recorder*> m_recorders;
 
 	xnl::Hash<XN_THREAD_ID, XN_EVENT_HANDLE> m_waitingThreads;
+	xnl::Hash<XN_THREAD_ID, XN_EVENT_HANDLE> m_knownThreads;
 
 	xnl::CriticalSection m_cs;
 
diff --git a/Source/Core/OniDevice.cpp b/Source/Core/OniDevice.cpp
index 24511f0b3..185e4666a 100644
--- a/Source/Core/OniDevice.cpp
+++ b/Source/Core/OniDevice.cpp
@@ -147,7 +147,7 @@ VideoStream* Device::createStream(OniSensorType sensorType)
 
 	{
 		// check if stream already exists. Do this in a lock to make it thread-safe
-		xnl::AutoCSLocker lock(m_sensors[sensorType]->m_refCountCS);
+		xnl::AutoCSLocker sensor_lock(m_sensors[sensorType]->m_refCountCS);
 		if (m_sensors[sensorType]->m_streamCount == 0)
 		{
 			void* streamHandle = m_driverHandler.deviceCreateStream(m_deviceHandle, sensorType);
diff --git a/Source/Core/OniFrameManager.cpp b/Source/Core/OniFrameManager.cpp
index 0d450aa79..cf591b0b1 100644
--- a/Source/Core/OniFrameManager.cpp
+++ b/Source/Core/OniFrameManager.cpp
@@ -1,5 +1,7 @@
 #include "OniFrameManager.h"
 #include <XnOSCpp.h>
+#include <XnLog.h>
+#define XN_MASK_ONI_FRAME_MANAGER "MGR"
 
 ONI_NAMESPACE_IMPLEMENTATION_BEGIN
 
@@ -36,6 +38,7 @@ OniFrameInternal* FrameManager::acquireFrame()
 	pFrame->refCount = 1; // this is the only reference
 	pFrame->freeBufferFunc = NULL;
 	pFrame->freeBufferFuncCookie = NULL;
+	xnLogVerbose(XN_MASK_ONI_FRAME_MANAGER, "Set %d @ %p", pFrame->refCount, (void*)pFrame);
 
 	return pFrame;
 }
@@ -44,14 +47,15 @@ void FrameManager::addRef(OniFrame* pFrame)
 {
 	OniFrameInternal* pInternal = (OniFrameInternal*)pFrame;
 	m_frames.Lock();
+	xnLogVerbose(XN_MASK_ONI_FRAME_MANAGER, "Inc %d @ %p", pInternal->refCount, (void*)pInternal);
 	++pInternal->refCount;
 	m_frames.Unlock();
 }
-
 void FrameManager::release(OniFrame* pFrame)
 {
 	OniFrameInternal* pInternal = (OniFrameInternal*)pFrame;
 	m_frames.Lock();
+	xnLogVerbose(XN_MASK_ONI_FRAME_MANAGER, "Dec %d @ %p", pInternal->refCount, (void*)pInternal);
 	if (--pInternal->refCount == 0)
 	{
 		// notify frame is back to pool
diff --git a/Source/Core/OniRecorder.cpp b/Source/Core/OniRecorder.cpp
index 1a70a7fa4..056852b78 100644
--- a/Source/Core/OniRecorder.cpp
+++ b/Source/Core/OniRecorder.cpp
@@ -586,11 +586,11 @@ typedef enum XnPixelFormat
 
 typedef struct XnSupportedPixelFormats
 {
-    XnBool m_bRGB24 : 1;
-    XnBool m_bYUV422 : 1;
-    XnBool m_bGrayscale8Bit : 1;
-    XnBool m_bGrayscale16Bit : 1;
-    XnBool m_bMJPEG : 1;
+    XnUInt m_bRGB24 : 1;
+    XnUInt m_bYUV422 : 1;
+    XnUInt m_bGrayscale8Bit : 1;
+    XnUInt m_bGrayscale16Bit : 1;
+    XnUInt m_bMJPEG : 1;
     XnUInt m_nPadding : 3;
     XnUInt m_nReserved : 24;
 } XnSupportedPixelFormats;
diff --git a/Source/Core/OniStream.cpp b/Source/Core/OniStream.cpp
index 096c158a2..f73293df5 100644
--- a/Source/Core/OniStream.cpp
+++ b/Source/Core/OniStream.cpp
@@ -442,8 +442,8 @@ void VideoStream::refreshWorldConversionCache()
 	getProperty(ONI_STREAM_PROPERTY_HORIZONTAL_FOV, &horizontalFov, &size);
 	getProperty(ONI_STREAM_PROPERTY_VERTICAL_FOV, &verticalFov, &size);
 
-	m_worldConvertCache.xzFactor = tan(horizontalFov / 2) * 2;
-	m_worldConvertCache.yzFactor = tan(verticalFov / 2) * 2;
+	m_worldConvertCache.xzFactor = (XnFloat)tan(horizontalFov / 2) * 2;
+	m_worldConvertCache.yzFactor = (XnFloat)tan(verticalFov / 2) * 2;
 	m_worldConvertCache.resolutionX = videoMode.resolutionX;
 	m_worldConvertCache.resolutionY = videoMode.resolutionY;
 	m_worldConvertCache.halfResX = m_worldConvertCache.resolutionX / 2;
diff --git a/Source/Core/OpenNI.cpp b/Source/Core/OpenNI.cpp
index 8c4e608fd..5648faa07 100644
--- a/Source/Core/OpenNI.cpp
+++ b/Source/Core/OpenNI.cpp
@@ -263,6 +263,11 @@ ONI_C_API void oniStreamStop(OniStreamHandle stream)
 	stream->pStream->stop();
 }
 
+ONI_C_API OniStatus oniStreamPeekFrame(OniStreamHandle stream, OniProcessFrameCallback handler, void* pCookie)
+{
+    return g_Context.peekFrame(stream, handler, pCookie);
+}
+
 ONI_C_API OniStatus oniStreamReadFrame(OniStreamHandle stream, OniFrame** pFrame)
 {
 	g_Context.clearErrorLogger();
diff --git a/Source/Core/OpenNI.vcxproj b/Source/Core/OpenNI.vcxproj
index 12189decf..654ab4e08 100644
--- a/Source/Core/OpenNI.vcxproj
+++ b/Source/Core/OpenNI.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/DepthUtils/DepthUtils.vcxproj b/Source/DepthUtils/DepthUtils.vcxproj
index dcab0b76c..263e3d906 100644
--- a/Source/DepthUtils/DepthUtils.vcxproj
+++ b/Source/DepthUtils/DepthUtils.vcxproj
@@ -35,23 +35,27 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/DummyDevice/DummyDevice.vcxproj b/Source/Drivers/DummyDevice/DummyDevice.vcxproj
index 56c594436..3ca1ac338 100644
--- a/Source/Drivers/DummyDevice/DummyDevice.vcxproj
+++ b/Source/Drivers/DummyDevice/DummyDevice.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/Kinect/BaseKinectStream.cpp b/Source/Drivers/Kinect/BaseKinectStream.cpp
index 93f81751d..0d959366e 100644
--- a/Source/Drivers/Kinect/BaseKinectStream.cpp
+++ b/Source/Drivers/Kinect/BaseKinectStream.cpp
@@ -52,7 +52,7 @@ OniStatus BaseKinectStream::getProperty(int propertyId, void* data, int* pDataSi
 	case ONI_STREAM_PROPERTY_CROPPING:
 		if (*pDataSize != sizeof(OniCropping))
 		{
-			printf("Unexpected size: %d != %d\n", *pDataSize, sizeof(OniCropping));
+			printf("Unexpected size: %d != %zd\n", *pDataSize, sizeof(OniCropping));
 			status = ONI_STATUS_ERROR;
 		}
 		else
@@ -88,7 +88,7 @@ OniStatus BaseKinectStream::getProperty(int propertyId, void* data, int* pDataSi
 		{
 			if (*pDataSize != sizeof(OniVideoMode))
 			{
-				printf("Unexpected size: %d != %d\n", *pDataSize, sizeof(OniVideoMode));
+				printf("Unexpected size: %d != %zd\n", *pDataSize, sizeof(OniVideoMode));
 				status = ONI_STATUS_ERROR;
 			}
 			else
@@ -113,7 +113,7 @@ OniStatus BaseKinectStream::setProperty(int propertyId, const void* data, int da
 	{
 		if (dataSize != sizeof(OniCropping))
 		{
-			printf("Unexpected size: %d != %d\n", dataSize, sizeof(OniCropping));
+			printf("Unexpected size: %d != %zd\n", dataSize, sizeof(OniCropping));
 			status = ONI_STATUS_ERROR;
 		}
 		status = SetCropping((OniCropping*)data);
@@ -122,7 +122,7 @@ OniStatus BaseKinectStream::setProperty(int propertyId, const void* data, int da
 	{
 		if (dataSize != sizeof(OniVideoMode))
 		{
-			printf("Unexpected size: %d != %d\n", dataSize, sizeof(OniVideoMode));
+			printf("Unexpected size: %d != %zd\n", dataSize, sizeof(OniVideoMode));
 			 status = ONI_STATUS_ERROR;
 		}
 		status = SetVideoMode((OniVideoMode*)data);
diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
index cb29d9ff6..ed4112779 100644
--- a/Source/Drivers/Kinect/Kinect.vcxproj
+++ b/Source/Drivers/Kinect/Kinect.vcxproj
@@ -28,12 +28,14 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -41,6 +43,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -48,6 +51,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/OniFile/OniFile.vcxproj b/Source/Drivers/OniFile/OniFile.vcxproj
index 9b173f7d8..fb6952f97 100644
--- a/Source/Drivers/OniFile/OniFile.vcxproj
+++ b/Source/Drivers/OniFile/OniFile.vcxproj
@@ -28,23 +28,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/OniFile/PlayerCodecFactory.cpp b/Source/Drivers/OniFile/PlayerCodecFactory.cpp
index dc6116465..31a5b4088 100644
--- a/Source/Drivers/OniFile/PlayerCodecFactory.cpp
+++ b/Source/Drivers/OniFile/PlayerCodecFactory.cpp
@@ -37,7 +37,6 @@ namespace oni_file {
 //---------------------------------------------------------------------------
 XnStatus PlayerCodecFactory::Create(XnCodecID nCodecID, PlayerSource* pSource, XnCodec** ppCodec)
 {
-	OniStatus rc;
 	XnCodec* pCodec = NULL;
 
 	switch (nCodecID)
@@ -57,8 +56,8 @@ XnStatus PlayerCodecFactory::Create(XnCodecID nCodecID, PlayerSource* pSource, X
 			// first we need to find max depth
 			int nMaxDepth;
 			int dataSize = sizeof(nMaxDepth);
-			rc = pSource->GetProperty(ONI_STREAM_PROPERTY_MAX_VALUE, &nMaxDepth, &dataSize);
-			if (rc != ONI_STATUS_OK)
+			OniStatus rc1 = pSource->GetProperty(ONI_STREAM_PROPERTY_MAX_VALUE, &nMaxDepth, &dataSize);
+			if (rc1 != ONI_STATUS_OK)
 			{
 				return XN_STATUS_ERROR;
 			}
@@ -76,8 +75,8 @@ XnStatus PlayerCodecFactory::Create(XnCodecID nCodecID, PlayerSource* pSource, X
 			// check what is the output format
 			OniVideoMode videoMode;
 			int dataSize = sizeof(videoMode);
-			rc = pSource->GetProperty(ONI_STREAM_PROPERTY_VIDEO_MODE, &videoMode, &dataSize);
-			if (rc != ONI_STATUS_OK)
+			OniStatus rc1 = pSource->GetProperty(ONI_STREAM_PROPERTY_VIDEO_MODE, &videoMode, &dataSize);
+			if (rc1 != ONI_STATUS_OK)
 			{
 				return XN_STATUS_ERROR;
 			}
diff --git a/Source/Drivers/OniFile/PlayerNode.cpp b/Source/Drivers/OniFile/PlayerNode.cpp
index 540b55e57..3dc37a90e 100644
--- a/Source/Drivers/OniFile/PlayerNode.cpp
+++ b/Source/Drivers/OniFile/PlayerNode.cpp
@@ -394,7 +394,6 @@ XnStatus PlayerNode::SeekToFrameAbsolute(XnUInt32 nNodeID, XnUInt32 nDestFrame)
 		// perform old seek (no data indexes)
 		XnUInt64 nStartPos = TellStream();
 		XnUInt32 nNextFrame = pPlayerNodeInfo->nCurFrame + 1;
-		XnStatus nRetVal = XN_STATUS_OK;
 
 		if (nDestFrame < nNextFrame)
 		{
@@ -1700,8 +1699,8 @@ XnStatus PlayerNode::SeekToTimeStampAbsolute(XnUInt64 nDestTimeStamp)
 				//Read rest of record and handle it normally
 				nRetVal = Read(m_pRecordBuffer + record.HEADER_SIZE, record.GetSize() - record.HEADER_SIZE, nBytesRead);
 				XN_IS_STATUS_OK(nRetVal);
-				Record record(m_pRecordBuffer, RECORD_MAX_SIZE, m_bIs32bitFileFormat);
-				nRetVal = HandleRecord(record, TRUE);
+				Record record2(m_pRecordBuffer, RECORD_MAX_SIZE, m_bIs32bitFileFormat);
+				nRetVal = HandleRecord(record2, TRUE);
 				XN_IS_STATUS_OK(nRetVal);
 				break;
 			}
diff --git a/Source/Drivers/PS1080/PS1080.vcxproj b/Source/Drivers/PS1080/PS1080.vcxproj
index 2a1154d5a..09023ea1f 100644
--- a/Source/Drivers/PS1080/PS1080.vcxproj
+++ b/Source/Drivers/PS1080/PS1080.vcxproj
@@ -525,23 +525,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
index b9adfeab8..947ecbdb5 100644
--- a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
+++ b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
@@ -28,19 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/PS1080/Sensor/XnDeviceSensor.h b/Source/Drivers/PS1080/Sensor/XnDeviceSensor.h
index 110f802aa..0748b9264 100644
--- a/Source/Drivers/PS1080/Sensor/XnDeviceSensor.h
+++ b/Source/Drivers/PS1080/Sensor/XnDeviceSensor.h
@@ -62,25 +62,25 @@
 
 #define XN_SENSOR_TIMESTAMP_SANITY_DIFF 10 // in ms
 
-#define XN_MASK_DEVICE_SENSOR			"DeviceSensor"
-#define XN_MASK_DEVICE_IO				"DeviceIO"
-#define XN_MASK_SENSOR_PROTOCOL			"DeviceSensorProtocol"
-#define XN_MASK_SENSOR_PROTOCOL_IMAGE	XN_MASK_SENSOR_PROTOCOL "Image"
-#define XN_MASK_SENSOR_PROTOCOL_DEPTH	XN_MASK_SENSOR_PROTOCOL "Depth"
-#define XN_MASK_SENSOR_PROTOCOL_AUDIO	XN_MASK_SENSOR_PROTOCOL "Audio"
-#define XN_MASK_SENSOR_READ				"DeviceSensorRead"
-#define XN_MASK_SENSOR_READ_IMAGE		XN_MASK_SENSOR_READ "Image"
-#define XN_MASK_SENSOR_READ_DEPTH		XN_MASK_SENSOR_READ "Depth"
-#define XN_MASK_SENSOR_READ_AUDIO		XN_MASK_SENSOR_READ "Audio"
-#define XN_DUMP_AUDIO_IN				"AudioIn"
-#define XN_DUMP_IMAGE_IN				"ImageIn"
-#define XN_DUMP_DEPTH_IN				"DepthIn"
-#define XN_DUMP_MINI_PACKETS			"MiniPackets"
-#define XN_DUMP_TIMESTAMPS				"SensorTimestamps"
-#define XN_DUMP_BANDWIDTH				"SensorBandwidth"
-#define XN_DUMP_BAD_IMAGE				"BadImage"
-#define XN_DUMP_FRAME_SYNC				"FrameSync"
-#define XN_DUMP_SENSOR_LOG				"SensorLog"
+#define XN_MASK_DEVICE_SENSOR           "DEV"
+#define XN_MASK_DEVICE_IO               "DIO"
+#define XN_MASK_SENSOR_PROTOCOL         "SPX"
+#define XN_MASK_SENSOR_PROTOCOL_IMAGE   XN_MASK_SENSOR_PROTOCOL "SPI"
+#define XN_MASK_SENSOR_PROTOCOL_DEPTH   XN_MASK_SENSOR_PROTOCOL "SPD"
+#define XN_MASK_SENSOR_PROTOCOL_AUDIO   XN_MASK_SENSOR_PROTOCOL "SPA"
+#define XN_MASK_SENSOR_READ             "SRX"
+#define XN_MASK_SENSOR_READ_IMAGE       XN_MASK_SENSOR_READ "SRI"
+#define XN_MASK_SENSOR_READ_DEPTH       XN_MASK_SENSOR_READ "SRD"
+#define XN_MASK_SENSOR_READ_AUDIO       XN_MASK_SENSOR_READ "SRA"
+#define XN_DUMP_AUDIO_IN                "AudioIn"
+#define XN_DUMP_IMAGE_IN                "ImageIn"
+#define XN_DUMP_DEPTH_IN                "DepthIn"
+#define XN_DUMP_MINI_PACKETS            "MiniPackets"
+#define XN_DUMP_TIMESTAMPS              "SensorTimestamps"
+#define XN_DUMP_BANDWIDTH               "SensorBandwidth"
+#define XN_DUMP_BAD_IMAGE               "BadImage"
+#define XN_DUMP_FRAME_SYNC              "FrameSync"
+#define XN_DUMP_SENSOR_LOG              "SensorLog"
 
 //---------------------------------------------------------------------------
 // Forward Declarations
diff --git a/Source/Drivers/PS1080/Sensor/XnSensorFPS.h b/Source/Drivers/PS1080/Sensor/XnSensorFPS.h
index 9afef6a40..a9ab1a486 100644
--- a/Source/Drivers/PS1080/Sensor/XnSensorFPS.h
+++ b/Source/Drivers/PS1080/Sensor/XnSensorFPS.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------
 // Defines
 //---------------------------------------------------------------------------
-#define XN_MASK_SENSOR_FPS	"FramesTimes"
+#define XN_MASK_SENSOR_FPS	"FPS"
 
 //---------------------------------------------------------------------------
 // XnSensorFPS class
diff --git a/Source/Drivers/PSLink/LinkProtoLib/XnLinkControlEndpoint.cpp b/Source/Drivers/PSLink/LinkProtoLib/XnLinkControlEndpoint.cpp
index 6d61c54e4..4519c3049 100644
--- a/Source/Drivers/PSLink/LinkProtoLib/XnLinkControlEndpoint.cpp
+++ b/Source/Drivers/PSLink/LinkProtoLib/XnLinkControlEndpoint.cpp
@@ -517,7 +517,7 @@ XnStatus LinkControlEndpoint::DownloadFile(XnUInt16 zone, const XnChar* fwFileNa
 
 	while (!isLast)
 	{
-		XnUInt32 nResponseSize = m_nMaxResponseSize;
+		nResponseSize = m_nMaxResponseSize;
 		nRetVal = ContinueResponseImpl(XN_LINK_MSG_DOWNLOAD_FILE, 0, m_pIncomingResponse, nResponseSize, isLast);
 		if (nRetVal != XN_STATUS_OK)
 		{
diff --git a/Source/Drivers/PSLink/PSLink.vcxproj b/Source/Drivers/PSLink/PSLink.vcxproj
index 8915163a5..b0e79193f 100644
--- a/Source/Drivers/PSLink/PSLink.vcxproj
+++ b/Source/Drivers/PSLink/PSLink.vcxproj
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
index e6c7c8cb5..dc1d0c316 100644
--- a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
+++ b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
@@ -28,19 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Drivers/TestDevice/TestDevice.cpp b/Source/Drivers/TestDevice/TestDevice.cpp
index e1832bfb7..e304cdbe1 100644
--- a/Source/Drivers/TestDevice/TestDevice.cpp
+++ b/Source/Drivers/TestDevice/TestDevice.cpp
@@ -61,7 +61,7 @@ class TestStream : public oni::driver::StreamBase
 		{
 			if (*pDataSize != sizeof(OniVideoMode))
 			{
-				printf("Unexpected size: %d != %d\n", *pDataSize, sizeof(OniVideoMode));
+				printf("Unexpected size: %d != %d\n", *pDataSize, int(sizeof(OniVideoMode)));
 				return ONI_STATUS_ERROR;
 			}
 			return GetVideoMode((OniVideoMode*)data);
@@ -76,7 +76,7 @@ class TestStream : public oni::driver::StreamBase
 		{
 			if (dataSize != sizeof(OniVideoMode))
 			{
-				printf("Unexpected size: %d != %d\n", dataSize, sizeof(OniVideoMode));
+				printf("Unexpected size: %d != %d\n", dataSize, int(sizeof(OniVideoMode)));
 				return ONI_STATUS_ERROR;
 			}
 			return SetVideoMode((OniVideoMode*)data);
@@ -85,7 +85,7 @@ class TestStream : public oni::driver::StreamBase
 		{
 			if (dataSize != sizeof(int))
 			{
-				printf("Unexpected size: %d != %d\n", dataSize, sizeof(int));
+				printf("Unexpected size: %d != %d\n", dataSize, int(sizeof(int)));
 				return ONI_STATUS_ERROR;
 			}
 
diff --git a/Source/Drivers/TestDevice/TestDevice.vcxproj b/Source/Drivers/TestDevice/TestDevice.vcxproj
index e20a074d5..868b3641a 100644
--- a/Source/Drivers/TestDevice/TestDevice.vcxproj
+++ b/Source/Drivers/TestDevice/TestDevice.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Source/Tools/NiViewer/Device.cpp b/Source/Tools/NiViewer/Device.cpp
index 28cbfeec1..27f50d849 100644
--- a/Source/Tools/NiViewer/Device.cpp
+++ b/Source/Tools/NiViewer/Device.cpp
@@ -275,9 +275,9 @@ openni::Status openDeviceFromList(DeviceConfig config)
 	{
 		printf("Choose device to open (1) [0 to exit]: ");
 
-		int rc = scanf("%d", &chosen);
+		int rc2 = scanf("%p", (void**)&chosen);
 
-		if (rc <= 0 || chosen == 0)
+		if (rc2 <= 0 || chosen == 0)
 		{
 			return openni::STATUS_ERROR;
 		}
diff --git a/Source/Tools/NiViewer/Draw.cpp b/Source/Tools/NiViewer/Draw.cpp
index 9bc75b15d..129858866 100644
--- a/Source/Tools/NiViewer/Draw.cpp
+++ b/Source/Tools/NiViewer/Draw.cpp
@@ -1286,7 +1286,6 @@ void drawPointerMode(IntPair* pPointer)
 			glEnd();
 
 			// place a label under, and in the middle of, that line.
-			XnUInt32 chars;
 			xnOSStrFormat(buf, sizeof(buf), &chars, "%d", i);
 			glColor3f(1,0,0);
 			glRasterPos2i(xPos - chars*nCharWidth/2, WIN_SIZE_Y - 40);
diff --git a/Source/Tools/NiViewer/NiViewer.vcxproj b/Source/Tools/NiViewer/NiViewer.vcxproj
index 0a4c3920a..d311a8cf0 100644
--- a/Source/Tools/NiViewer/NiViewer.vcxproj
+++ b/Source/Tools/NiViewer/NiViewer.vcxproj
@@ -27,23 +27,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/ThirdParty/PSCommon/BuildSystem/BuildJavaWindows.py b/ThirdParty/PSCommon/BuildSystem/BuildJavaWindows.py
index f58e5f2e9..fbd011a93 100644
--- a/ThirdParty/PSCommon/BuildSystem/BuildJavaWindows.py
+++ b/ThirdParty/PSCommon/BuildSystem/BuildJavaWindows.py
@@ -5,7 +5,7 @@
 
 # parse command line
 if len(sys.argv) < 5:
-    print "usage: " + sys.argv[0] + " <x86|x64> <BinDir> <SourceDir> <Name> [NeededJarFiles] [MainClass]"
+    print("usage: " + sys.argv[0] + " <x86|x64> <BinDir> <SourceDir> <Name> [NeededJarFiles] [MainClass]")
     exit(1)
 
 platform_string = ""
@@ -14,7 +14,7 @@
 elif sys.argv[1] == "x64":
     platform_string = "x64"
 else:
-    print 'First argument must be "x86", "x64" or empty (x86)'
+    print('First argument must be "x86", "x64" or empty (x86)')
     exit(1)
     
 bin_dir = os.path.abspath(sys.argv[2])
@@ -37,7 +37,7 @@
 # make sure JAVA_HOME is set
 JAVA_HOME = os.path.expandvars("$JAVA_HOME")
 if JAVA_HOME == "":
-    print "JAVA_HOME is not set!"
+    print("JAVA_HOME is not set!")
     exit(1)
     
 CLASS_PATH = os.path.expandvars("$CLASSPATH")
@@ -106,7 +106,7 @@
     
 # create batch file (by default, windows does not open a console when double-clicking jar files)
 if main_class != "":
-    print "Creating batch file..."
+    print("Creating batch file...")
     batch = open(BATCH_FILE, 'w')
     batch.write('java -Xmx768m -jar ' + proj_name + '.jar\n')
     batch.close()
diff --git a/ThirdParty/PSCommon/BuildSystem/Platform.Arm b/ThirdParty/PSCommon/BuildSystem/Platform.Arm
index c4a112df8..e03c09221 100644
--- a/ThirdParty/PSCommon/BuildSystem/Platform.Arm
+++ b/ThirdParty/PSCommon/BuildSystem/Platform.Arm
@@ -1,7 +1,7 @@
 ifeq "$(CFG)" "Release"
 
     # Hardware specifying flags
-    CFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp #-mcpu=cortex-a8
+    CFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard #-mcpu=cortex-a8
 
     # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
     CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
diff --git a/ThirdParty/PSCommon/XnLib/Include/XnCallback.h b/ThirdParty/PSCommon/XnLib/Include/XnCallback.h
index 36fe4277d..983e7d9d4 100644
--- a/ThirdParty/PSCommon/XnLib/Include/XnCallback.h
+++ b/ThirdParty/PSCommon/XnLib/Include/XnCallback.h
@@ -30,8 +30,8 @@
 struct XnCallback
 {
 	XnCallback() : pFuncPtr(NULL), pCookie(NULL) {}
-	XnCallback(XnFuncPtr pFuncPtr, void* pCookie) : pFuncPtr(pFuncPtr), pCookie(pCookie) {}
-	void Set(XnFuncPtr pFuncPtr, void* pCookie) { this->pFuncPtr = pFuncPtr; this->pCookie = pCookie; }
+	XnCallback(XnFuncPtr _pFuncPtr, void* _pCookie) : pFuncPtr(_pFuncPtr), pCookie(_pCookie) {}
+	void Set(XnFuncPtr _pFuncPtr, void* _pCookie) { this->pFuncPtr = _pFuncPtr; this->pCookie = _pCookie; }
 
 	XnFuncPtr pFuncPtr;
 	void* pCookie;
diff --git a/ThirdParty/PSCommon/XnLib/Include/XnMath.h b/ThirdParty/PSCommon/XnLib/Include/XnMath.h
index df6044d97..6a7846454 100644
--- a/ThirdParty/PSCommon/XnLib/Include/XnMath.h
+++ b/ThirdParty/PSCommon/XnLib/Include/XnMath.h
@@ -35,7 +35,7 @@ namespace xnl
 		}
 		inline XnFloat Abs(XnFloat f)
 		{
-			return fabs(f);
+			return (XnFloat)fabs(f);
 		}
 		template <class T>
 		XnBool IsZero(T value, T tolerance)
@@ -48,11 +48,11 @@ namespace xnl
 		}
 		inline XnFloat Sqrt(XnFloat f)
 		{
-			return sqrt(f);
+			return (XnFloat)sqrt(f);
 		}
 		inline XnDouble Sqrt(XnDouble f)
 		{
-			return sqrt(f);
+			return (XnFloat)sqrt(f);
 		}
 		template <class T>
 		T Min(T value1, T value2)
diff --git a/ThirdParty/PSCommon/XnLib/Include/XnVector3D.h b/ThirdParty/PSCommon/XnLib/Include/XnVector3D.h
index 21728739d..5511becee 100644
--- a/ThirdParty/PSCommon/XnLib/Include/XnVector3D.h
+++ b/ThirdParty/PSCommon/XnLib/Include/XnVector3D.h
@@ -171,7 +171,7 @@ XnFloat &Vector3D::operator[](XnUInt32 index)
 
 Vector3D& Vector3D::Set(const Vector3D& other) {*this = other; return *this;}
 Vector3D& Vector3D::Set(const Point3D& point) {*this = point; return *this;}
-Vector3D& Vector3D::Set(XnFloat x, XnFloat y, XnFloat z) {this->x = x; this->y = y; this->z = z; return *this;}
+Vector3D& Vector3D::Set(XnFloat _x, XnFloat _y, XnFloat _z) {this->x = _x; this->y = _y; this->z = _z; return *this;}
 
 Vector3D& Vector3D::SetZero() {return Set(Zero());}
 XnBool Vector3D::IsZero() const {return *this==Zero();}
diff --git a/ThirdParty/PSCommon/XnLib/Source/Win32/XnUSBWin32.cpp b/ThirdParty/PSCommon/XnLib/Source/Win32/XnUSBWin32.cpp
index 68f3ec464..024a7e344 100644
--- a/ThirdParty/PSCommon/XnLib/Source/Win32/XnUSBWin32.cpp
+++ b/ThirdParty/PSCommon/XnLib/Source/Win32/XnUSBWin32.cpp
@@ -63,7 +63,7 @@ XnUSBEventCallbackList g_connectivityEvent;
 DWORD __stdcall DevDetectThread(LPVOID Arg)
 {
 	char className[MAX_PATH];
-	sprintf_s(className, "xnUsbDeviceDetector%x", &g_xnUsbhModule);
+	sprintf_s(className, "xnUsbDeviceDetector%p", &g_xnUsbhModule);
 
 	g_xnUsbhDevDetectWnd = CreateWindow(className, "", WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
 
@@ -302,7 +302,7 @@ XnStatus xnUSBPlatformSpecificInit()
 
 	// give a unique class name (there might be multiple instances of this code in multiple DLLs)
 	char className[MAX_PATH];
-	sprintf_s(className, "xnUsbDeviceDetector%x", &g_xnUsbhModule);
+	sprintf_s(className, "xnUsbDeviceDetector%p", &g_xnUsbhModule);
 
 	WNDCLASS wc;
 	wc.style = 0;
diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
index 276122252..01c4d6910 100644
--- a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
+++ b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
@@ -116,23 +116,27 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLogFileWriter.cpp b/ThirdParty/PSCommon/XnLib/Source/XnLogFileWriter.cpp
index 767512fcc..a33d476fb 100644
--- a/ThirdParty/PSCommon/XnLib/Source/XnLogFileWriter.cpp
+++ b/ThirdParty/PSCommon/XnLib/Source/XnLogFileWriter.cpp
@@ -49,10 +49,12 @@ void XnLogFileWriter::WriteEntry(const XnLogEntry* pEntry)
 	// write timestamp and severity
 	const XnUInt32 nMaxMessageSize = 2047;
 	XnChar strBuffer[nMaxMessageSize + 1];
+	XN_THREAD_ID tid;
+	xnOSGetCurrentThreadID(&tid);
 
 	XnUInt32 nMessageLen = 0;
 	XnUInt32 nChars = 0;
-	xnOSStrFormat(strBuffer + nMessageLen, nMaxMessageSize - nMessageLen, &nChars, "%9llu\t%-10s\t%s\t", pEntry->nTimestamp, pEntry->strSeverity, pEntry->strMask);
+	xnOSStrFormat(strBuffer + nMessageLen, nMaxMessageSize - nMessageLen, &nChars, "%9llu\t[0x%.8x]\t%-10s\t%s\t", pEntry->nTimestamp, (unsigned)tid, pEntry->strSeverity, pEntry->strMask);
 	nMessageLen += nChars;
 
 	if (m_bWriteLineInfo)
diff --git a/ThirdParty/PSCommon/XnLib/Source/XnSytmmetricMatrix3x3.cpp b/ThirdParty/PSCommon/XnLib/Source/XnSytmmetricMatrix3x3.cpp
index b2329a38f..175ebf166 100644
--- a/ThirdParty/PSCommon/XnLib/Source/XnSytmmetricMatrix3x3.cpp
+++ b/ThirdParty/PSCommon/XnLib/Source/XnSytmmetricMatrix3x3.cpp
@@ -48,11 +48,11 @@ Vector3D SymmetricMatrix3x3::GetEigenValuesNoScaling() const
 	XnFloat a02_sqr = Math::Sqr(m_x02);
 	XnFloat a12_sqr = Math::Sqr(m_x12);
 	XnFloat p = (XnFloat)Math::ONE_SIXTH * (a00*a00+a11*a11+a22*a22 + 2*(a01_sqr+a02_sqr+a12_sqr));
-	XnFloat q = (XnFloat).5*(a00*(a11*a22-a12_sqr)-a11*a02_sqr-a22*a01_sqr) + m_x01*m_x02*m_x12;
+	XnFloat q = XnFloat(0.5)*(a00*(a11*a22-a12_sqr)-a11*a02_sqr-a22*a01_sqr) + m_x01*m_x02*m_x12;
 	XnFloat sqrt_p = Math::Sqrt(p), disc = p*p*p-q*q;
-	XnFloat phi = (XnFloat)Math::ONE_THIRD*atan2(Math::Sqrt(Math::Max((XnFloat)0,disc)),q);
-	XnFloat c=cos(phi) , s=sin(phi);
-	XnFloat sqrt_p_cos = sqrt_p*c, root_three_sqrt_p_sin = (XnFloat)Math::ROOT_THREE*sqrt_p*s;
+	XnFloat phi = XnFloat(Math::ONE_THIRD)*(XnFloat)atan2(Math::Sqrt(Math::Max((XnFloat)0,disc)),q);
+	XnFloat c= (XnFloat)cos(phi) , s= (XnFloat)sin(phi);
+	XnFloat sqrt_p_cos = sqrt_p*c, root_three_sqrt_p_sin = XnFloat(Math::ROOT_THREE)*sqrt_p*s;
 	Vector3D lambda(m+2*sqrt_p_cos, m-sqrt_p_cos-root_three_sqrt_p_sin, m-sqrt_p_cos+root_three_sqrt_p_sin);
 	Math::ExchangeSort(lambda.z, lambda.y, lambda.x);
 	return lambda;
diff --git a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
index b95c484c8..cae24eb56 100644
--- a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
+++ b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
@@ -28,18 +28,22 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">