diff --git a/CMakeLists.txt b/CMakeLists.txt
index f47642f3..80f0e8c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,11 +142,11 @@ endif()
 #
 if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+	if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
             set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall -I/usr/local/include")
-        else()
-            set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall")
-        endif()
+	else()
+	    set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall")
+	endif()
     else()
         set(CMAKE_CXX_FLAGS "-std=c++14 -Wall")
     endif()
@@ -161,7 +161,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         else()
             set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -pthread")
         endif()
-    endif()
+    endif(NANA_CMAKE_SHARED_LIB)
 
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
         # GCC 4.9
@@ -173,9 +173,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     endif()
 endif()
 
-if(APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    list(APPEND NANA_LINKS -stdlib=libstdc++)
-endif()
+
+if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")                    # APPLE Clang
+  list(APPEND NANA_LINKS -stdlib=libstdc++)
+endif ()
 
 
 ############# Optional libraries
@@ -354,26 +355,27 @@ endif()
 
 
 # Just for information:
-message("")
-message("CMAKE_CXX_COMPILER_ID     = " ${CMAKE_CXX_COMPILER_ID})
-message("COMPILER_IS_CLANG         = " ${COMPILER_IS_CLANG})
-message("CMAKE_COMPILER_IS_GNUCXX  = " ${CMAKE_COMPILER_IS_GNUCXX})
-message("CMAKE_CXX_FLAGS           = " ${CMAKE_CXX_FLAGS})
-message("CMAKE_EXE_LINKER_FLAGS    = " ${CMAKE_EXE_LINKER_FLAGS})
-message("CMAKE_STATIC_LINKER_FLAGS = " ${CMAKE_STATIC_LINKER_FLAGS})
-message("NANA_LINKS                = " ${NANA_LINKS})
-message("DESTDIR                   = " ${DESTDIR})
-message("CMAKE_INSTALL_PREFIX      = " ${CMAKE_INSTALL_PREFIX})
-message("NANA_INCLUDE_DIR          = " ${NANA_INCLUDE_DIR})
-message("CMAKE_CURRENT_SOURCE_DIR  = " ${CMAKE_CURRENT_SOURCE_DIR})
-message("NANA_CMAKE_ENABLE_AUDIO   = " ${NANA_CMAKE_ENABLE_AUDIO})
-message("NANA_CMAKE_SHARED_LIB     = " ${NANA_CMAKE_SHARED_LIB})
-message("NANA_CLION                = " ${NANA_CLION})
-message("CMAKE_MAKE_PROGRAM        = " ${CMAKE_MAKE_PROGRAM})
+message ("")
+message ( "CMAKE_CXX_COMPILER_ID     = "  ${CMAKE_CXX_COMPILER_ID})
+message ( "COMPILER_IS_CLANG         = "  ${COMPILER_IS_CLANG})
+message ( "CMAKE_COMPILER_IS_GNUCXX  = "  ${CMAKE_COMPILER_IS_GNUCXX})
+message ( "CMAKE_CXX_FLAGS           = "  ${CMAKE_CXX_FLAGS})
+message ( "CMAKE_EXE_LINKER_FLAGS    = "  ${CMAKE_EXE_LINKER_FLAGS})
+message ( "CMAKE_STATIC_LINKER_FLAGS = "  ${CMAKE_STATIC_LINKER_FLAGS})
+message ( "NANA_LINKS                = "  ${NANA_LINKS})
+message ( "DESTDIR                   = "  ${DESTDIR})
+message ( "CMAKE_INSTALL_PREFIX      = "  ${CMAKE_INSTALL_PREFIX})
+message ( "NANA_INCLUDE_DIR          = "  ${NANA_INCLUDE_DIR})
+message ( "CMAKE_CURRENT_SOURCE_DIR  = "  ${CMAKE_CURRENT_SOURCE_DIR})
+message ( "NANA_CMAKE_ENABLE_AUDIO   = "  ${NANA_CMAKE_ENABLE_AUDIO})
+message ( "NANA_CMAKE_SHARED_LIB     = "  ${NANA_CMAKE_SHARED_LIB})
+message ( "NANA_CLION              = "  ${NANA_CLION})
+message ( "CMAKE_MAKE_PROGRAM      = "  ${CMAKE_MAKE_PROGRAM})
+message ( "CMAKE_CXX_COMPILER_VERSION = " ${CMAKE_CXX_COMPILER_VERSION})
 
-message("NANA_CMAKE_FIND_BOOST_FILESYSTEM         = " ${NANA_CMAKE_FIND_BOOST_FILESYSTEM})
-message("NANA_CMAKE_BOOST_FILESYSTEM_FORCE        = " ${NANA_CMAKE_BOOST_FILESYSTEM_FORCE})
-message("NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT = " ${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT})
-message("NANA_CMAKE_BOOST_FILESYSTEM_LIB          = " ${NANA_CMAKE_BOOST_FILESYSTEM_LIB})
-message("NANA_CMAKE_AUTOMATIC_GUI_TESTING         = " ${NANA_CMAKE_AUTOMATIC_GUI_TESTING})
-message("NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING = " ${NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING})
+message ( "NANA_CMAKE_FIND_BOOST_FILESYSTEM         = "  ${NANA_CMAKE_FIND_BOOST_FILESYSTEM})
+message ( "NANA_CMAKE_BOOST_FILESYSTEM_FORCE        = "  ${NANA_CMAKE_BOOST_FILESYSTEM_FORCE})
+message ( "NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT = "  ${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT})
+message ( "NANA_CMAKE_BOOST_FILESYSTEM_LIB          = "  ${NANA_CMAKE_BOOST_FILESYSTEM_LIB})
+message ( "NANA_CMAKE_AUTOMATIC_GUI_TESTING         = "  ${NANA_CMAKE_AUTOMATIC_GUI_TESTING})
+message ( "NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING = "  ${NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING})