diff --git a/CHANGELOG b/CHANGELOG
index 0b860c4220e348d8780da6205ae749af7e98ec76..cadb94adbd80910013d4d785f58488dbc9cbfa47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@ TODO::
 LAST DONE:
 
 CHANGES:
+- ver. 0.20.010 - <b>2021.09.15</b> Changed: 
+  - Fixed: DSP::WMM_object_t::stop_playback fix
+  - Fixed: hello.cpp - using different wav file path if test_echo() is used
+
 - ver. 0.20.009 - <b>2021.09.10</b> Changed: 
   - Fixed: DSP::WMM_object_t and DSP::SOUND_object_t now send to sound card all pending data and wait for finish before closing
 
diff --git a/examples/hello.cpp b/examples/hello.cpp
index 2e0fcc5ea9a29f7bf9c58e60b6bca35dd8cb7045..2f9b40fd4c47e0c0b6653f9e9a58adab47f570e4 100644
--- a/examples/hello.cpp
+++ b/examples/hello.cpp
@@ -25,7 +25,11 @@ int test_hello(void)
  
   MasterClock=DSP::Clock::CreateMasterClock();
 
+#ifndef INCLUDE_DSPE_EXAMPLES
   DSP::u::WaveInput AudioIn(MasterClock, "DSPElib.wav", ".");
+#else
+  DSP::u::WaveInput AudioIn(MasterClock, "DSPElib.wav", "../examples");
+#endif // INCLUDE_DSPE_EXAMPLES
   Fp = AudioIn.GetSamplingRate();
 
   DSP::u::AudioOutput AudioOut(Fp);
diff --git a/src/cpp/WMM_support.cpp b/src/cpp/WMM_support.cpp
index f935df6e01c8601c6a2642deb2dfd6babc1e2cf5..abf2e1d7d18bb220b66b40dc4a513fa0d0de4018 100644
--- a/src/cpp/WMM_support.cpp
+++ b/src/cpp/WMM_support.cpp
@@ -143,9 +143,9 @@ bool DSP::WMM_object_t::stop_playback(void) {
   // if there are still buffers that haven't been yet sent to sound card then do it now
   if (IsPlayingNow == false)
   {
-    if (NextBufferOutInd == DSP::NoOfAudioOutputBuffers - 2) //all but one spare buffer are filled up
+    if (NextBufferOutInd > 0) //all but one spare buffer are filled up
     { // send all data from buffers to soundcard to start playback
-      for (unsigned int ind=0; ind < DSP::NoOfAudioOutputBuffers-1; ind++) //one spare buffer
+      for (unsigned int ind=0; ind < NextBufferOutInd; ind++) //one spare buffer
       {
         result=waveOutWrite(hWaveOut,
           &(waveHeaderOut[ind]), sizeof(WAVEHDR));
diff --git a/src/include/DSP_lib.h b/src/include/DSP_lib.h
index e0ff366ba389c97f418bbd6d3c79770501c9b465..53fc9bbc42038a5da1a66e0796d0bc5a6ddc3887 100644
--- a/src/include/DSP_lib.h
+++ b/src/include/DSP_lib.h
@@ -11,7 +11,7 @@
 
 #define DSP_VER_MAJOR 0
 #define DSP_VER_MINOR 20
-#define DSP_VER_BUILD 9 // !!! without zeroes before, else this will be treated as octal number
+#define DSP_VER_BUILD 10 // !!! without zeroes before, else this will be treated as octal number
 #define DSP_VER_YEAR  2021
 #define DSP_VER       DSP_VER_MAJOR.DSP_VER_MINOR.DSP_VER_BUILD