diff --git a/.travis.yml b/.travis.yml
index f1995a39..02ceda02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,6 @@ before_script :
   - cd bld
 
 script:
-  - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON
-  #-DENABLE_JPEG=ON -DENABLE_PNG=ON
+  - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON -DENABLE_AUDIO=OFF
+   
   - make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040b3d89..e9394b86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,7 @@ endif(ENABLE_JPEG)
 if(ENABLE_AUDIO)
     add_definitions(-DNANA_ENABLE_AUDIO)
     if(UNIX)
-        find_package(asound)
+        find_package(ASOUND)
         if (ASOUND_FOUND)
             include_directories( ${ASOUND_INCLUDE_DIRS})
 	        list(APPEND NANA_LINKS   -lasound )				
@@ -207,7 +207,8 @@ if (BUILD_NANA_DEMOS)
     set(CMAKE_INSTALL_PREFIX )
     add_executable(file_explorer ../nana-demo/file_explorer.cpp)
     set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(file_explorer ${PROJECT_NAME} )         #X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}
+    target_link_libraries(file_explorer ${PROJECT_NAME} )         
+	#X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB}
     install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(calculator ../nana-demo/calculator.cpp)
@@ -224,35 +225,36 @@ if (BUILD_NANA_DEMOS)
 
     add_executable(notepad ../nana-demo/notepad.cpp)
     set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(notepad ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(notepad ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show ../nana-demo/widget_show.cpp)
     set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
     set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show2 ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(widget_show2 ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
     install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
     set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(a_group_impl ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(a_group_impl ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
     add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
     set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(animate-bmp ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
-
-    add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
-    set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(audio_player ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    target_link_libraries(animate-bmp ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
+	if (ENABLE_AUDIO)
+		add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
+		set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
+		target_link_libraries(audio_player ${PROJECT_NAME} ) 
+	endif(ENABLE_AUDIO)
 
     #add_executable(nana_test test.cpp)
     #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-    #target_link_libraries(nana_test ${PROJECT_NAME}#)  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+    #target_link_libraries(nana_test ${PROJECT_NAME})#  X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
 
    #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
    #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@@ -263,7 +265,7 @@ if (BUILD_NANA_DEMOS)
    #    string( REPLACE ".cpp" "" demoname ${demofile} )
    #    add_executable( ${demoname} ${demofile} )
    #    set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
-   #    target_link_libraries(${demoname} ${PROJECT_NAME} #) X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
+   #    target_link_libraries(${demoname} ${PROJECT_NAME} )# X11 Xft ${NANA_JPEG_LIB} ${NANA_PNG_LIB})
    #endforeach( demofile ${DEMO_SOURCES} )
 endif(BUILD_NANA_DEMOS)
 
@@ -289,9 +291,10 @@ endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
       set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")
     endif ()
 
-message ( "CMAKE_CXX_COMPILER_ID= " ${CMAKE_CXX_COMPILER_ID})
-message ( "COMPILER_IS_CLANG= " ${COMPILER_IS_CLANG})
-message ( "CMAKE_CXX_FLAGS= "  ${CMAKE_CXX_FLAGS})
+message ( "CMAKE_CXX_COMPILER_ID   = "  ${CMAKE_CXX_COMPILER_ID})
+message ( "COMPILER_IS_CLANG       = "  ${COMPILER_IS_CLANG})
+message ( "CMAKE_CXX_FLAGS         = "  ${CMAKE_CXX_FLAGS})
 message ( "CMAKE_COMPILER_IS_GNUCXX= "  ${CMAKE_COMPILER_IS_GNUCXX})
-message ( "CMAKE_EXE_LINKER_FLAGS= "  ${CMAKE_EXE_LINKER_FLAGS})
-message ( "NANA_LINKS= "  ${NANA_LINKS})
+message ( "CMAKE_EXE_LINKER_FLAGS  = "  ${CMAKE_EXE_LINKER_FLAGS})
+message ( "NANA_LINKS              = "  ${NANA_LINKS})
+message ( "ENABLE_AUDIO            = "  ${ENABLE_AUDIO})