diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h
index 1e454550..a95ccff2 100644
--- a/include/spdlog/details/async_log_helper.h
+++ b/include/spdlog/details/async_log_helper.h
@@ -56,19 +56,19 @@ class async_log_helper
         ~async_msg() = default;
 
 
-async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
-        logger_name(std::move(other.logger_name)),
-                    level(std::move(other.level)),
-                    time(std::move(other.time)),
-					thread_id(other.thread_id),
-                    txt(std::move(other.txt)),
-                    msg_type(std::move(other.msg_type))
+        async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
+            logger_name(std::move(other.logger_name)),
+            level(std::move(other.level)),
+            time(std::move(other.time)),
+            thread_id(other.thread_id),
+            txt(std::move(other.txt)),
+            msg_type(std::move(other.msg_type))
         {}
 
         async_msg(async_msg_type m_type):
-			level(level::info),
-			thread_id(0),
-			msg_type(m_type)
+            level(level::info),
+            thread_id(0),
+            msg_type(m_type)
         {}
 
         async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT
diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h
index c712b27a..cf65f31b 100644
--- a/include/spdlog/details/logger_impl.h
+++ b/include/spdlog/details/logger_impl.h
@@ -195,6 +195,63 @@ inline void spdlog::logger::critical(const T& msg)
     log(level::critical, msg);
 }
 
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+#include <codecvt>
+
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const wchar_t* msg)
+{
+	std::wstring_convert<std::codecvt_utf8<wchar_t> > conv;
+
+	log(lvl, conv.to_bytes(msg));
+}
+
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const wchar_t* fmt, const Args&... args)
+{
+	fmt::WMemoryWriter wWriter;
+
+	wWriter.write(fmt, args...);
+	log(lvl, wWriter.c_str());
+}
+
+template <typename... Args>
+inline void spdlog::logger::trace(const wchar_t* fmt, const Args&... args)
+{
+	log(level::trace, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::debug(const wchar_t* fmt, const Args&... args)
+{
+	log(level::debug, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::info(const wchar_t* fmt, const Args&... args)
+{
+	log(level::info, fmt, args...);
+}
+
+
+template <typename... Args>
+inline void spdlog::logger::warn(const wchar_t* fmt, const Args&... args)
+{
+	log(level::warn, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::error(const wchar_t* fmt, const Args&... args)
+{
+	log(level::err, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::critical(const wchar_t* fmt, const Args&... args)
+{
+	log(level::critical, fmt, args...);
+}
+#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
 
 
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index 637962a8..1e557c89 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -365,6 +365,17 @@ inline std::string filename_to_str(const filename_t& filename)
 }
 #endif
 
+inline std::string errno_to_string(char [256], char* res) {
+    return std::string(res);
+}
+    
+inline std::string errno_to_string(char buf[256], int res) {
+    if (res == 0) {
+        return std::string(buf);
+    } else {
+        return "Unknown error";
+    }
+}
 
 // Return errno string (thread safe)
 inline std::string errno_str(int err_num)
@@ -387,7 +398,8 @@ inline std::string errno_str(int err_num)
         return "Unknown error";
 
 #else  // gnu version (might not use the given buf, so its retval pointer must be used)
-    return std::string(strerror_r(err_num, buf, buf_size));
+    auto err = strerror_r(err_num, buf, buf_size); // let compiler choose type
+    return errno_to_string(buf, err); // use overloading to select correct stringify function
 #endif
 }
 
diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
index 58b4841a..0c864f9e 100644
--- a/include/spdlog/logger.h
+++ b/include/spdlog/logger.h
@@ -43,6 +43,16 @@ public:
     template <typename Arg1, typename... Args> void warn(const char* fmt, const Arg1&, const Args&... args);
     template <typename Arg1, typename... Args> void error(const char* fmt, const Arg1&, const Args&... args);
     template <typename Arg1, typename... Args> void critical(const char* fmt, const Arg1&, const Args&... args);
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+	template <typename... Args> void log(level::level_enum lvl, const wchar_t* msg);
+	template <typename... Args> void log(level::level_enum lvl, const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void trace(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void debug(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void info(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void warn(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void error(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void critical(const wchar_t* fmt, const Args&... args);
+#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
     template <typename T> void log(level::level_enum lvl, const T&);
     template <typename T> void trace(const T&);
diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
index bde27967..c167c716 100644
--- a/include/spdlog/tweakme.h
+++ b/include/spdlog/tweakme.h
@@ -101,6 +101,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
+///////////////////////////////////////////////////////////////////////////////
+// Uncomment to enable wchar_t support (convert to utf8)
+//
+// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT
+///////////////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////////////
 // Uncomment to prevent child processes from inheriting log file descriptors
 //
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ce275ccb..22329b4e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(Threads)
 add_library(catch INTERFACE)
 target_include_directories(catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp)
 
 add_executable(catch_tests ${catch_tests})
 target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT})