diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index d9526fb28d2b7e6aaee90aa79c1ea44da84bf672..2613977113896a115d7999e5bb975a39f9490cc9 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -71,13 +71,13 @@ if(WIN32)
 	#endif()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES -DNOMINMAX -DWIN32_LEAN_AND_MEAN -DCURL_STATICLIB")
     #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /bigobj /O2")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /bigobj /O2 /Oi /Oy /Ot /Ob2")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /bigobj /O0")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT /bigobj /O2")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT /bigobj /O2 /Oi /Oy /Ot /Ob2")
 	
-	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT /bigobj /O2")
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT /bigobj /O2 /Oi /Oy /Ot /Ob2")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd /bigobj /O0")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT /bigobj /O2")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT /bigobj /O2 /Oi /Oy /Ot /Ob2")
 	
     set(GLEW_STATIC ON)
 else()
@@ -228,7 +228,7 @@ SET(trex_subproject_CMAKE_ARGS ${trex_subproject_CMAKE_ARGS}
 	"-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}"
 	"-DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO}"
 	"-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}"
-    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
+	"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
     "-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}"
     "-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
     "-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
@@ -754,18 +754,12 @@ if(${TREX_BUILD_OPENCV})
     endif()
     
     set(OPENCV_PREFIX_PATH ${png_install_dir} ${zlib_install_dir} ${CMAKE_PREFIX_PATH} )
-    set(OPENCV_EXTRA_FLAGS_ ${OPENCV_EXTRA_FLAGS} 
-	"-DCMAKE_CXX_FLAGS_RELEASE=/MT"
-	"-DCMAKE_C_FLAGS_RELEASE=/MT"
-	"-DCMAKE_C_FLAGS_RELWITHDEBINFO=/MT"
-	"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=/MT"
-	"-DCMAKE_C_FLAGS_DEBUG=/MTd"
-	"-DCMAKE_CXX_FLAGS_DEBUG=/MTd"
-			#"-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}"
-            #"-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
-            #"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
-            #"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
-			#"-DCMAKE_CXX_FLAGS=${ORIGINAL_CXX_FLAGS}"
+    set(OPENCV_EXTRA_FLAGS_ ${OPENCV_EXTRA_FLAGS}
+			"-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}"
+            "-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
+            "-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
+            "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
+			"-DCMAKE_CXX_FLAGS=${ORIGINAL_CXX_FLAGS} -D_USE_MATH_DEFINES -DNOMINMAX -DCURL_STATICLIB -D_ENABLE_ATOMIC_ALIGNMENT_FIX"
             "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
             
     if(APPLE AND CMAKE_COMPILER_IS_GNUCXX)