diff --git a/include/Release.htm b/include/Release.htm
index 61125c9..41586e6 100644
--- a/include/Release.htm
+++ b/include/Release.htm
@@ -31,7 +31,7 @@
 <ul>
  <li><h3>slightly reduced bit-rates with lower modes, better compatibility when using stdin</h3></li>
  <li><h3>exhaleApp: support for Unicode text on Windows&trade;, 44100 Hz with CVBR mode 1</h3></li>
- <li><h3>exhaleApp: automatic upsampling of low-sample-rate input, better WAVE reading</h3></li>
+ <li><h3>exhaleApp: automatic upsampling of low-sample-rate input, fixed reader (issue 9)</h3></li>
  <li><h3>exhaleLib: optimized noise filling tool for slightly lower bit-rates at CVBR mode &lt;4</h3></li>
  <li><h3>compilation: exhaleApp.exe -> exhale.exe (issue 8), support for Arm&trade;, C header</h3></li>
 </ul>
@@ -79,7 +79,7 @@
 <h3>&nbsp; &nbsp;If you notice an issue with this release <b>not</b> mentioned below, please contact ecodis or a contributor with the details (configuration, input file) needed to reproduce the issue.</h3>
 <ul>
  <li><h3>exhaleLib: Coding of stereo or multichannel input occasionally leads to slightly in&shy;creased bit-rates because the predictive joint-channel coding provided by ISO/IEC <a href="https://www.iso.org/standard/76385.html">23003-3</a> has not been fully implemented. See the functionality roadmap below.</h3></li>
- <li><h3>exhaleApp: Only basic WAVE input file reading functionality has been implemen&shy;ted. Specifically, 8-bit WAVE input is assumed to contain an even number of audio samples, and the Broadcast and Extensible WAVE file formats are not supported.</h3></li>
+ <li><h3>exhaleApp: Only basic WAVE input file reading functionality has been implemen&shy;ted. Specifically, 8-bit WAVE input is assumed to contain an even number of audio samples, and ITU-R <a href="https://www.itu.int/rec/R-REC-BS.2088/en">BS.2088</a> (RF64) or Extensible WAVE files are not supported.</h3></li>
 </ul>
 <h3><br><b>Roadmap of Upcoming Features</b></h3>
 <h3>&nbsp; &nbsp;If you are in need of an additional library or application feature <b>not</b> mentioned below, please contact ecodis or a contributor with a request, and we will see what we can do.</h3>
diff --git a/src/app/basicWavReader.cpp b/src/app/basicWavReader.cpp
index 7b4af82..d20f960 100644
--- a/src/app/basicWavReader.cpp
+++ b/src/app/basicWavReader.cpp
@@ -90,13 +90,12 @@ bool BasicWavReader::seekToChunkTag (uint8_t* const buf, const uint32_t tagID)
     if ((m_bytesRemaining > LLONG_MAX - USHRT_MAX) || (m_readOffset = _SEEK (m_fileHandle, m_chunkLength, 1 /*SEEK_CUR*/)) == -1)
     {
       // for stdin compatibility, don't abort, try reading
-      for (int64_t i = m_chunkLength >> 1; i > 0; i--) m_bytesRead = _READ (m_fileHandle, buf, 2); // TODO: byte-wise?
+      for (int64_t i = m_chunkLength >> 1; i > 0; i--) m_bytesRead = _READ (m_fileHandle, buf, 2);
     }
     m_bytesRemaining -= m_chunkLength;
-    if (m_bytesRemaining <= 0)
-    {
-      return false; // an error which should never happen!
-    }
+
+    if (m_bytesRemaining <= 0) return false;  // unlikely!
+
     if ((m_bytesRead = _READ (m_fileHandle, buf, CHUNK_HEADER_SIZE)) != CHUNK_HEADER_SIZE) return false; // error
     m_bytesRemaining -= m_bytesRead;
     m_chunkLength = fourBytesToLength (&buf[4], m_bytesRemaining);
@@ -142,7 +141,7 @@ unsigned BasicWavReader::readDataFloat16 (const int fileHandle, int32_t* frameBu
   {
     int16_t i16 = 0;
 
-    bytesRead += _READ (fileHandle, &i16, 2); // two bytes
+    bytesRead += _READ (fileHandle, &i16, 2);
 
     const int32_t e = ((i16 & 0x7C00) >> 10) - 18; // exp.
     // an exponent e <= -12 will lead to zero-quantization
@@ -190,9 +189,9 @@ unsigned BasicWavReader::readDataFloat32 (const int fileHandle, int32_t* frameBu
 
   for (unsigned i = frameCount * chanCount; i > 0; i--)
   {
-    float f32 = 0.0; // IEEE-754 normalized floating point
+    float f32 = 0.0;
 
-    bytesRead += _READ (fileHandle, &f32, 4);   // 4 bytes
+    bytesRead += _READ (fileHandle, &f32, 4);
     *frameBuf = int32_t (f32 * (1 << 23) + (f32 < 0.0 ? -0.5 : 0.5)); // * 2^23 with rounding
     if (*frameBuf < MIN_VALUE_AUDIO24) *frameBuf = MIN_VALUE_AUDIO24;
     else
@@ -234,7 +233,7 @@ unsigned BasicWavReader::readDataLnPcm08 (const int fileHandle, int32_t* frameBu
   {
     uint8_t ui8 = 128;
 
-    bytesRead += _READ (fileHandle, &ui8, 1);  // one byte
+    bytesRead += _READ (fileHandle, &ui8, 1);
     *(frameBuf++) = ((int32_t) ui8 - 128) << 16; // * 2^16
   }
   return bytesRead / chanCount;
@@ -272,7 +271,7 @@ unsigned BasicWavReader::readDataLnPcm16 (const int fileHandle, int32_t* frameBu
   {
     int16_t i16 = 0;
 
-    bytesRead += _READ (fileHandle, &i16, 2); // two bytes
+    bytesRead += _READ (fileHandle, &i16, 2);
     *(frameBuf++) = (int32_t) i16 << 8; // * 2^8
   }
   return bytesRead / (chanCount * 2);
@@ -312,7 +311,7 @@ unsigned BasicWavReader::readDataLnPcm24 (const int fileHandle, int32_t* frameBu
   {
     int32_t i24 = 0;
 
-    bytesRead += _READ (fileHandle, &i24, 3);   // 3 bytes
+    bytesRead += _READ (fileHandle, &i24, 3);
     *(frameBuf++) = (i24 > MAX_VALUE_AUDIO24 ? i24 + 2 * MIN_VALUE_AUDIO24 : i24);
   }
   return bytesRead / (chanCount * 3);
@@ -351,7 +350,7 @@ unsigned BasicWavReader::readDataLnPcm32 (const int fileHandle, int32_t* frameBu
   for (unsigned i = frameCount * chanCount; i > 0; i--)
   {
     int32_t i24 = 0;
-    bytesRead += _READ (fileHandle, &i24, 4);   // 4 bytes
+    bytesRead += _READ (fileHandle, &i24, 4);
     i24 = ((i24 >> 1) + (1 << 6)) >> 7; // * 2^-8 with rounding, overflow-safe
     *(frameBuf++) = __min (MAX_VALUE_AUDIO24, i24);
   }
@@ -423,19 +422,21 @@ unsigned BasicWavReader::open (const int wavFileHandle, const uint16_t maxFrameR
 
 unsigned BasicWavReader::read (int32_t* const frameBuf, const uint16_t frameCount)
 {
+  const unsigned framesTotal = __min (m_frameLimit, frameCount);
   unsigned framesRead;
 
-  if ((frameBuf == nullptr) || (m_fileHandle == -1) || (__min (m_frameLimit, frameCount) == 0) || (m_byteBuffer == nullptr) ||
+  if ((frameBuf == nullptr) || (m_fileHandle == -1) || (framesTotal == 0) || (m_byteBuffer == nullptr) ||
       (m_bytesRemaining <= 0)) // end of chunk reached
   {
     return 0; // invalid args or class not initialized
   }
-  framesRead  = m_readDataFunc (m_fileHandle, frameBuf, __min (m_frameLimit, frameCount), m_waveChannels, m_byteBuffer);
+  framesRead  = m_readDataFunc (m_fileHandle, frameBuf, framesTotal, m_waveChannels, m_byteBuffer);
   m_bytesRead = m_waveFrameSize * framesRead;
   if ((m_bytesRemaining -= m_bytesRead) < 0)
   {
     m_bytesRead = unsigned (m_bytesRead + m_bytesRemaining);
     framesRead  = m_bytesRead / m_waveFrameSize;
+    if (framesRead < framesTotal) memset (&frameBuf[framesRead * m_waveChannels], 0, (framesTotal - framesRead) * m_waveChannels * sizeof (int32_t));
   }
   m_chunkLength += m_bytesRead;