diff --git a/build/cmake/shared_libs.cmake b/build/cmake/shared_libs.cmake
index 85e4a706..a158317d 100644
--- a/build/cmake/shared_libs.cmake
+++ b/build/cmake/shared_libs.cmake
@@ -39,8 +39,8 @@ endif()
 if(NANA_STATIC_STDLIB)
     target_link_libraries(nana
         PUBLIC
-            $<$<CXX_COMPILER_ID:GNU>:-static-libgcc>
-            $<$<CXX_COMPILER_ID:Clang>:-static-libstdc++>
+            $<$<CXX_COMPILER_ID:GNU>:-static-libgcc -static-libstdc++>
+            $<$<CXX_COMPILER_ID:Clang>:-static-libgcc -static-libstdc++>
             )
 endif()
 
diff --git a/source/paint/image.cpp b/source/paint/image.cpp
index 857c31f7..389ed68e 100644
--- a/source/paint/image.cpp
+++ b/source/paint/image.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  *	Paint Image Implementation
  *	Nana C++ Library(http://www.nanapro.org)
  *	Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
@@ -7,9 +7,8 @@
  *	(See accompanying file LICENSE_1_0.txt or copy at
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
- *	@file: nana/paint/image.cpp
- *	@contributors:
- *		nabijaczleweli(pr#106)
+ *	@file nana/paint/image.cpp
+ *	@contributors nabijaczleweli(pr#106)
  */
 
 #include <nana/push_ignore_diagnostic>