diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ffdc012..e416d60c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,12 @@
 # Contributor:
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
-
+#   Ariel Vina-Rodriguez (qPCR4vir) 
 
 #https://cmake.org/cmake-tutorial/
 #https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption
-# use CACHE FORCE?  or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entery build dir
+# use CACHE FORCE  or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entirely build dir
+# if your changes don't execute
 option(USE_meganz_mingw_std_threads "replaced boost.thread with meganz's mingw-std-threads." OFF)
 option(USE_UNICODE "Use Unicode Character Set" ON)
 option(ENABLE_PNG "Enable the use of PNG" OFF)
@@ -16,8 +17,8 @@ option(ENABLE_JPEG "Enable the use of JPEG" OFF)
 option(LIBJPEG_FROM_OS "Use libjpeg from operating system." ON)
 option(CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." OFF)
 option(CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
-option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." ON)
-option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>().")
+option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." OFF)
+option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>()." OFF)
 #set(CMAKE_STD_make_unique_NOT_SUPPORTED OFF)
 
 # set compile  flags
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index cbac37f0..52ec94c6 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -52,10 +52,6 @@
 
 			#define NANA_WINDOWS
 
-			// MINGW ...
-			#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
-				#define NANA_MINGW
-			#endif // MINGW
 		// end Windows
 
 
@@ -101,18 +97,15 @@
 	#endif // _MSC_VER == 1900
 #endif // _MSVC
 
-#if defined(__clang__)
-	#if defined(__GLIBCPP__) || defined(__GLIBCXX__)
-		//<codecvt> is a known issue on libstdc++, it works on libc++
-		#define STD_CODECVT_NOT_SUPPORTED
-	#endif
-
+#if   defined(__clang__)
 #elif defined(__GNUC__) //GCC
-	#if defined(__GLIBCPP__) || defined( __GLIBCXX__ )
-		//<codecvt> is a known issue on libstdc++, it works on libc++
-		#define STD_CODECVT_NOT_SUPPORTED
-	#endif
 
+	// MINGW ...
+	#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
+		#define NANA_MINGW
+	#endif // MINGW
+
+	// support for GCC 4.8.1 will be discontinued. Please use v5 or newer.
 	#if (__GNUC__ == 4)
 		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
 			#define STD_THREAD_NOT_SUPPORTED
@@ -141,6 +134,10 @@
 	#endif
 #endif
 
+//<codecvt> is a known issue on libstdc++, it works on libc++
+#if defined(__GLIBCPP__) || defined( __GLIBCXX__ )
+	#define STD_CODECVT_NOT_SUPPORTED
+#endif // __GLIBCPP__ or __GLIBCXX__
 
 
 // End compilers ...