diff --git a/src/yssimplesound/src/CMakeLists.txt b/src/yssimplesound/src/CMakeLists.txt
index fd53076..a0597ff 100644
--- a/src/yssimplesound/src/CMakeLists.txt
+++ b/src/yssimplesound/src/CMakeLists.txt
@@ -50,7 +50,7 @@ add_library(yssimplesound_nownd yssimplesound.cpp yssimplesound.h nownd/yssimple
 target_include_directories(yssimplesound_nownd PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(unittest)
-
+add_subdirectory(playwav)
 
 
 set(YS_ALL_BATCH_TEST ${YS_ALL_BATCH_TEST} PARENT_SCOPE)
diff --git a/src/yssimplesound/src/playwav/CMakeLists.txt b/src/yssimplesound/src/playwav/CMakeLists.txt
new file mode 100644
index 0000000..c724f72
--- /dev/null
+++ b/src/yssimplesound/src/playwav/CMakeLists.txt
@@ -0,0 +1,14 @@
+if(MSVC)
+	set(LIBS yssimplesound_dsound)
+elseif(APPLE)
+	find_library(COCOA_LIB Cocoa)
+	mark_as_advanced(COCOA_LIB)
+	set(LIBS yssimplesound_macosx ${COCOA_LIB})
+elseif(UNIX)
+	set(LIBS yssimplesound_linux_alsa pthread)
+endif()
+
+
+set(TARGET_NAME playwav)
+add_executable(${TARGET_NAME} playwav.cpp)
+target_link_libraries(${TARGET_NAME} fssimplewindow yssimplesound ${LIBS})
diff --git a/src/yssimplesound/src/playwav/playwav.cpp b/src/yssimplesound/src/playwav/playwav.cpp
new file mode 100644
index 0000000..6479d05
--- /dev/null
+++ b/src/yssimplesound/src/playwav/playwav.cpp
@@ -0,0 +1,31 @@
+#include "yssimplesound.h"
+#include <iostream>
+
+
+
+int main(int ac,char *av[])
+{
+	if(2!=ac)
+	{
+		std::cout << "Usage: playwav waveFileName.wav" << std::endl;;
+		return 1;
+	}
+
+	YsSoundPlayer player;
+	YsSoundPlayer::SoundData data;
+	if(YSOK!=data.LoadWav(av[1]))
+	{
+		std::cout << "Cannot load .WAV" << std::endl;;
+		return 1;
+	}
+
+	player.Start();
+	player.PlayOneShot(data);
+	while(YSTRUE==player.IsPlaying(data))
+	{
+		player.KeepPlaying();
+	}
+	player.End();
+
+	return 0;
+}
diff --git a/src/yssimplesound/src/yssimplesound.cpp b/src/yssimplesound/src/yssimplesound.cpp
index 4eea227..5ecd987 100644
--- a/src/yssimplesound/src/yssimplesound.cpp
+++ b/src/yssimplesound/src/yssimplesound.cpp
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <ctype.h>
 #include "yssimplesound.h"
 
 YsSoundPlayer *YsSoundPlayer::currentPlayer=nullptr;
@@ -506,68 +507,109 @@ YSRESULT YsSoundPlayer::SoundData::LoadWav(BinaryInStream &inStream)
 	// Wait, is it fSize+12?  A new theory tells that "fmt " immediately following "WAVE"
 	// is a chunk???
 
-	if(inStream.Fetch(buf,8)!=8)
-	{
-		printf("Error in reading WAVEfmt.\n");
-		return YSERR;
-	}
-	if(strncmp((char *)buf,"WAVEfmt",7)!=0)
-	{
-		printf("Warning: WAVEfmt not found\n");
-	}
-
-
 	if(inStream.Fetch(buf,4)!=4)
 	{
-		printf("Error in reading header size.\n");
+		printf("Error in reading WAVE signature.\n");
 		return YSERR;
 	}
-	hdrSize=GetUnsigned(buf);
-	printf("Header Size=%d\n",hdrSize);
-
-
-	//    WORD  wFormatTag; 
-	//    WORD  nChannels; 
-	//    DWORD nSamplesPerSec; 
-	//    DWORD nAvgBytesPerSec; 
-	//    WORD  nBlockAlign; 
-	//    WORD  wBitsPerSample; 
-	//    WORD  cbSize; 
-	if(inStream.Fetch(buf,hdrSize)!=hdrSize)
+	if(strncmp((char *)buf,"WAVE",4)!=0)
 	{
-		printf("Error in reading header.\n");
-		return YSERR;
+		printf("Warning: WAVE signature not found\n");
 	}
-	wFormatTag=GetUnsignedShort(buf);
-	nChannels=GetUnsignedShort(buf+2);
-	nSamplesPerSec=GetUnsigned(buf+4);
-	nAvgBytesPerSec=GetUnsigned(buf+8);
-	nBlockAlign=GetUnsignedShort(buf+12);
-	wBitsPerSample=(hdrSize>=16 ? GetUnsignedShort(buf+14) : 0);
-	cbSize=(hdrSize>=18 ? GetUnsignedShort(buf+16) : 0);
-
-	printf("wFormatTag=%d\n",wFormatTag);
-	printf("nChannels=%d\n",nChannels);
-	printf("nSamplesPerSec=%d\n",nSamplesPerSec);
-	printf("nAvgBytesPerSec=%d\n",nAvgBytesPerSec);
-	printf("nBlockAlign=%d\n",nBlockAlign);
-	printf("wBitsPerSample=%d\n",wBitsPerSample);
-	printf("cbSize=%d\n",cbSize);
-
 
 
+	bool fmtSet=false,dataSet=false;
 	for(;;)
 	{
 		if(inStream.Fetch(buf,4)!=4)
 		{
-			printf("Error while waiting for data.\n");
-			return YSERR;
+			if(true!=fmtSet)
+			{
+				printf("Error WAVE format not set before the end of file.\n");
+				return YSERR;
+			}
+			if(true!=dataSet)
+			{
+				printf("Error WAVE data not set before the end of file.\n");
+				return YSERR;
+			}
+			break;
 		}
 
-		if((buf[0]=='d' || buf[0]=='D') && (buf[1]=='a' || buf[1]=='A') &&
-		   (buf[2]=='t' || buf[2]=='T') && (buf[3]=='a' || buf[3]=='A'))
+		buf[0]=toupper(buf[0]);
+		buf[1]=toupper(buf[1]);
+		buf[2]=toupper(buf[2]);
+		buf[3]=toupper(buf[3]);
+
+		if('F'==buf[0] && 'M'==buf[1] && 'T'==buf[2])
 		{
-			break;
+			if(true==fmtSet)
+			{
+				printf("Error: Multiple fmt tags.\n");
+				return YSERR;
+			}
+			if(inStream.Fetch(buf,4)!=4)
+			{
+				printf("Error in reading header size.\n");
+				return YSERR;
+			}
+			hdrSize=GetUnsigned(buf);
+			printf("Header Size=%d\n",hdrSize);
+
+			//    WORD  wFormatTag;
+			//    WORD  nChannels;
+			//    DWORD nSamplesPerSec;
+			//    DWORD nAvgBytesPerSec;
+			//    WORD  nBlockAlign;
+			//    WORD  wBitsPerSample;
+			//    WORD  cbSize;
+			if(inStream.Fetch(buf,hdrSize)!=hdrSize)
+			{
+				printf("Error in reading header.\n");
+				return YSERR;
+			}
+			wFormatTag=GetUnsignedShort(buf);
+			nChannels=GetUnsignedShort(buf+2);
+			nSamplesPerSec=GetUnsigned(buf+4);
+			nAvgBytesPerSec=GetUnsigned(buf+8);
+			nBlockAlign=GetUnsignedShort(buf+12);
+			wBitsPerSample=(hdrSize>=16 ? GetUnsignedShort(buf+14) : 0);
+			cbSize=(hdrSize>=18 ? GetUnsignedShort(buf+16) : 0);
+
+			printf("wFormatTag=%d\n",wFormatTag);
+			printf("nChannels=%d\n",nChannels);
+			printf("nSamplesPerSec=%d\n",nSamplesPerSec);
+			printf("nAvgBytesPerSec=%d\n",nAvgBytesPerSec);
+			printf("nBlockAlign=%d\n",nBlockAlign);
+			printf("wBitsPerSample=%d\n",wBitsPerSample);
+			printf("cbSize=%d\n",cbSize);
+
+			fmtSet=true;
+		}
+		else if(buf[0]=='D' && buf[1]=='A' && buf[2]=='T' && buf[3]=='A')
+		{
+			if(true==dataSet)
+			{
+				printf("Error: Multiple DATA tags appeared.\n");
+				return YSERR;
+			}
+
+			if(inStream.Fetch(buf,4)!=4)
+			{
+				printf("Error in reading data size.\n");
+				return YSERR;
+			}
+			dataSize=GetUnsigned(buf);
+			printf("Data Size=%d (0x%x)\n",dataSize,dataSize);
+
+			dat.resize(dataSize);
+			if((l=inStream.Fetch(dat.data(),dataSize))!=dataSize)
+			{
+				printf("Warning: File ended before reading all data.\n");
+				printf("  %d (0x%x) bytes have been read\n",l,l);
+			}
+
+			dataSet=true;
 		}
 		else
 		{
@@ -578,8 +620,6 @@ YSRESULT YsSoundPlayer::SoundData::LoadWav(BinaryInStream &inStream)
 				return YSERR;
 			}
 
-
-
 			l=GetUnsigned(buf);
 			if(inStream.Skip(l)!=l)
 			{
@@ -589,22 +629,6 @@ YSRESULT YsSoundPlayer::SoundData::LoadWav(BinaryInStream &inStream)
 		}
 	}
 
-
-	if(inStream.Fetch(buf,4)!=4)
-	{
-		printf("Error in reading data size.\n");
-		return YSERR;
-	}
-	dataSize=GetUnsigned(buf);
-	printf("Data Size=%d (0x%x)\n",dataSize,dataSize);
-
-	dat.resize(dataSize);
-	if((l=inStream.Fetch(dat.data(),dataSize))!=dataSize)
-	{
-		printf("Warning: File ended before reading all data.\n");
-		printf("  %d (0x%x) bytes have been read\n",l,l);
-	}
-
 	this->stereo=(nChannels==2 ? YSTRUE : YSFALSE);
 	this->bit=wBitsPerSample;
 	this->sizeInBytes=dataSize;