diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f3c14f1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.lib filter=lfs diff=lfs merge=lfs -text
+*.dll filter=lfs diff=lfs merge=lfs -text
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
index 349082d..2217151 100644
--- a/CMake/Dependencies.cmake
+++ b/CMake/Dependencies.cmake
@@ -29,3 +29,8 @@ MACRO_DISPLAY_FEATURE_LOG()
 include_directories(
   ${OPENAL_INCLUDE_DIR}
 )
+if(WIN32)
+  include_directories(
+    "${OPENAL_INCLUDE_DIR}/../"
+  )
+endif()
\ No newline at end of file
diff --git a/Dependencies/bin/debug/OpenAL32.dll b/Dependencies/bin/debug/OpenAL32.dll
index d0ee3cc..784c7d6 100644
Binary files a/Dependencies/bin/debug/OpenAL32.dll and b/Dependencies/bin/debug/OpenAL32.dll differ
diff --git a/Dependencies/bin/debug/wrap_oal.dll b/Dependencies/bin/debug/wrap_oal.dll
index 91e90fc..2fee217 100644
Binary files a/Dependencies/bin/debug/wrap_oal.dll and b/Dependencies/bin/debug/wrap_oal.dll differ
diff --git a/Dependencies/bin/release/OpenAL32.dll b/Dependencies/bin/release/OpenAL32.dll
index d0ee3cc..784c7d6 100644
Binary files a/Dependencies/bin/release/OpenAL32.dll and b/Dependencies/bin/release/OpenAL32.dll differ
diff --git a/Dependencies/bin/release/wrap_oal.dll b/Dependencies/bin/release/wrap_oal.dll
index 91e90fc..2fee217 100644
Binary files a/Dependencies/bin/release/wrap_oal.dll and b/Dependencies/bin/release/wrap_oal.dll differ
diff --git a/Dependencies/lib/Debug/OpenAL32.lib b/Dependencies/lib/Debug/OpenAL32.lib
index d635de9..9c24234 100644
Binary files a/Dependencies/lib/Debug/OpenAL32.lib and b/Dependencies/lib/Debug/OpenAL32.lib differ
diff --git a/Dependencies/lib/Release/OpenAL32.lib b/Dependencies/lib/Release/OpenAL32.lib
index d635de9..9c24234 100644
Binary files a/Dependencies/lib/Release/OpenAL32.lib and b/Dependencies/lib/Release/OpenAL32.lib differ
diff --git a/Dependencies64/bin/debug/OpenAL32.dll b/Dependencies64/bin/debug/OpenAL32.dll
index f927ee8..3f171cd 100644
Binary files a/Dependencies64/bin/debug/OpenAL32.dll and b/Dependencies64/bin/debug/OpenAL32.dll differ
diff --git a/Dependencies64/bin/debug/wrap_oal.dll b/Dependencies64/bin/debug/wrap_oal.dll
index b49f0db..fb0fb5d 100644
Binary files a/Dependencies64/bin/debug/wrap_oal.dll and b/Dependencies64/bin/debug/wrap_oal.dll differ
diff --git a/Dependencies64/bin/release/OpenAL32.dll b/Dependencies64/bin/release/OpenAL32.dll
index c5c928f..62282ea 100644
Binary files a/Dependencies64/bin/release/OpenAL32.dll and b/Dependencies64/bin/release/OpenAL32.dll differ
diff --git a/Dependencies64/bin/release/wrap_oal.dll b/Dependencies64/bin/release/wrap_oal.dll
index 4ba16a7..19c91cf 100644
Binary files a/Dependencies64/bin/release/wrap_oal.dll and b/Dependencies64/bin/release/wrap_oal.dll differ
diff --git a/Dependencies64/lib/Debug/OpenAL32.lib b/Dependencies64/lib/Debug/OpenAL32.lib
index d635de9..d1c2574 100644
Binary files a/Dependencies64/lib/Debug/OpenAL32.lib and b/Dependencies64/lib/Debug/OpenAL32.lib differ
diff --git a/Dependencies64/lib/Release/OpenAL32.lib b/Dependencies64/lib/Release/OpenAL32.lib
index d635de9..9c24234 100644
Binary files a/Dependencies64/lib/Release/OpenAL32.lib and b/Dependencies64/lib/Release/OpenAL32.lib differ
diff --git a/Examples/CSharpExamples/bin/debug/EAXLegacyPreset_d.dll b/Examples/CSharpExamples/bin/debug/EAXLegacyPreset_d.dll
index edd5888..0dfdf4f 100644
Binary files a/Examples/CSharpExamples/bin/debug/EAXLegacyPreset_d.dll and b/Examples/CSharpExamples/bin/debug/EAXLegacyPreset_d.dll differ
diff --git a/Examples/CSharpExamples/bin/debug/OpenAL32.dll b/Examples/CSharpExamples/bin/debug/OpenAL32.dll
index d0ee3cc..784c7d6 100644
Binary files a/Examples/CSharpExamples/bin/debug/OpenAL32.dll and b/Examples/CSharpExamples/bin/debug/OpenAL32.dll differ
diff --git a/Examples/CSharpExamples/bin/debug/cAp_mp3Decoder_d.dll b/Examples/CSharpExamples/bin/debug/cAp_mp3Decoder_d.dll
index 1e87c09..7138366 100644
Binary files a/Examples/CSharpExamples/bin/debug/cAp_mp3Decoder_d.dll and b/Examples/CSharpExamples/bin/debug/cAp_mp3Decoder_d.dll differ
diff --git a/Examples/CSharpExamples/bin/debug/cAudioCSharpWrapper.dll b/Examples/CSharpExamples/bin/debug/cAudioCSharpWrapper.dll
index 2ac76e0..13687bd 100644
Binary files a/Examples/CSharpExamples/bin/debug/cAudioCSharpWrapper.dll and b/Examples/CSharpExamples/bin/debug/cAudioCSharpWrapper.dll differ
diff --git a/Examples/CSharpExamples/bin/debug/cAudio_d.dll b/Examples/CSharpExamples/bin/debug/cAudio_d.dll
index 19f092c..a4edc9a 100644
Binary files a/Examples/CSharpExamples/bin/debug/cAudio_d.dll and b/Examples/CSharpExamples/bin/debug/cAudio_d.dll differ
diff --git a/Examples/CSharpExamples/bin/debug/wrap_oal.dll b/Examples/CSharpExamples/bin/debug/wrap_oal.dll
index 91e90fc..2fee217 100644
Binary files a/Examples/CSharpExamples/bin/debug/wrap_oal.dll and b/Examples/CSharpExamples/bin/debug/wrap_oal.dll differ
diff --git a/Examples/CSharpExamples/bin/release/EAXLegacyPreset.dll b/Examples/CSharpExamples/bin/release/EAXLegacyPreset.dll
index 00eb8dd..8e09f73 100644
Binary files a/Examples/CSharpExamples/bin/release/EAXLegacyPreset.dll and b/Examples/CSharpExamples/bin/release/EAXLegacyPreset.dll differ
diff --git a/Examples/CSharpExamples/bin/release/OpenAL32.dll b/Examples/CSharpExamples/bin/release/OpenAL32.dll
index d0ee3cc..784c7d6 100644
Binary files a/Examples/CSharpExamples/bin/release/OpenAL32.dll and b/Examples/CSharpExamples/bin/release/OpenAL32.dll differ
diff --git a/Examples/CSharpExamples/bin/release/cAp_mp3Decoder.dll b/Examples/CSharpExamples/bin/release/cAp_mp3Decoder.dll
index 75540a6..4ed53cb 100644
Binary files a/Examples/CSharpExamples/bin/release/cAp_mp3Decoder.dll and b/Examples/CSharpExamples/bin/release/cAp_mp3Decoder.dll differ
diff --git a/Examples/CSharpExamples/bin/release/cAudio.dll b/Examples/CSharpExamples/bin/release/cAudio.dll
index e74ee18..d23fdff 100644
Binary files a/Examples/CSharpExamples/bin/release/cAudio.dll and b/Examples/CSharpExamples/bin/release/cAudio.dll differ
diff --git a/Examples/CSharpExamples/bin/release/cAudioCSharpWrapper.dll b/Examples/CSharpExamples/bin/release/cAudioCSharpWrapper.dll
index 5c228ab..aeb952c 100644
Binary files a/Examples/CSharpExamples/bin/release/cAudioCSharpWrapper.dll and b/Examples/CSharpExamples/bin/release/cAudioCSharpWrapper.dll differ
diff --git a/Examples/CSharpExamples/bin/release/wrap_oal.dll b/Examples/CSharpExamples/bin/release/wrap_oal.dll
index 91e90fc..2fee217 100644
Binary files a/Examples/CSharpExamples/bin/release/wrap_oal.dll and b/Examples/CSharpExamples/bin/release/wrap_oal.dll differ
diff --git a/cAudio/CMakeLists.txt b/cAudio/CMakeLists.txt
index 1e68759..edbaf75 100644
--- a/cAudio/CMakeLists.txt
+++ b/cAudio/CMakeLists.txt
@@ -15,6 +15,9 @@ set(CAUDIO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/i
 include(cAudio_src_files.cmake)		
 add_library(cAudio ${CAUDIO_LIB_TYPE} ${file_root})
 
+set(OPENAL_INCLUDE_DIRS ${OPENAL_INCLUDE_DIRS}/..) #dats gross but it helps finding the headers ;)
+message(STATUS "openal include dirs:" ${OPENAL_INCLUDE_DIRS})
+
 if(CAUDIO_ENABLE_OGG)
 	include_directories (include Headers ${CMAKE_BINARY_DIR}/include ${OPENAL_INCLUDE_DIRS} ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
 	target_link_libraries(cAudio ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
@@ -26,8 +29,8 @@ else()
 	target_link_libraries(cAudio ${OPENAL_LIBRARIES})
 endif()
 
-set_property(TARGET ${CMAKE_PROJECT_NAME} PROPERTY VERSION "2.3.0")
-set_property(TARGET ${CMAKE_PROJECT_NAME} PROPERTY SOVERSION 2 )
+set_property(TARGET cAudio PROPERTY VERSION "2.3.0")
+set_property(TARGET cAudio PROPERTY SOVERSION 2 )
 
 if (APPLE AND CAUDIO_IOS_BUILD)
 	set_target_properties(cAudio PROPERTIES XCODE_ATTRIBUTE_GCC_THUMB_SUPPORT "NO")
diff --git a/cAudio/include/cAudioString.h b/cAudio/include/cAudioString.h
index f70d2f0..b218e18 100644
--- a/cAudio/include/cAudioString.h
+++ b/cAudio/include/cAudioString.h
@@ -20,7 +20,7 @@
 namespace cAudio
 {
 
-#if defined(UNICODE) || defined(_UNICODE)
+#if defined(CAUDIO_USE_UNICODE)
 #	define _CTEXT(x)	L ## x
 #	define cstrcmp		wcscmp
 #	define cAudioChar	wchar_t
@@ -35,15 +35,15 @@ namespace cAudio
 #if CAUDIO_REROUTE_STRING_ALLOCATIONS == 1
 	typedef std::basic_string< cAudioChar, std::char_traits<cAudioChar>, cSTLAllocator<cAudioChar> > cAudioString;
 #else
-#	if defined(UNICODE) || defined(_UNICODE)
+#	if defined(CAUDIO_USE_UNICODE)
 		typedef std::basic_string<cAudioChar> cAudioString;
 #	else
 	typedef std::string cAudioString;
 #	endif
 #endif
 
-    
-#if defined(CAUDIO_PLATFORM_WIN)
+// Conversion is only required if using wide characters in cAudioString
+#if defined(CAUDIO_PLATFORM_WIN) && (defined(CAUDIO_USE_UNICODE))
     static const char* toUTF8(const cAudioString& str)
     {
         static int id = 0;