diff --git a/README.html b/README.html
index 853e504..b2f5342 100644
--- a/README.html
+++ b/README.html
@@ -865,6 +865,7 @@ submitted bugfixes:</p>
   <li> Takashi Iwai</li>
   <li> Thomas Klausner</li>
   <li> Lu Zhihe</li>
+	<li> Luzpaz</li>
   <li> Tony Mechelynck </li>
   <li> Mathias M&ouml;hl</li>
   <li> Yuval Naveh</li>
diff --git a/config/am_include.mk b/config/am_include.mk
index cb4e400..5d6bdfb 100644
--- a/config/am_include.mk
+++ b/config/am_include.mk
@@ -17,7 +17,7 @@
 ## Place - Suite 330, Boston, MA  02111-1307, USA
 
 ## These are common definitions used in all Makefiles
-## It is actually included when a makefile.am is coverted to Makefile.in
+## It is actually included when a makefile.am is converted to Makefile.in
 ## by automake, so it's ok to have @MACROS@ that will be set by configure
 
 AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/include/FIFOSampleBuffer.h b/include/FIFOSampleBuffer.h
index 3a37bc3..de298dd 100644
--- a/include/FIFOSampleBuffer.h
+++ b/include/FIFOSampleBuffer.h
@@ -112,7 +112,7 @@ public:
     /// 'putSamples(numSamples)' function.
     SAMPLETYPE *ptrEnd(
                 uint slackCapacity   ///< How much free capacity (in samples) there _at least_ 
-                                     ///< should be so that the caller can succesfully insert the 
+                                     ///< should be so that the caller can successfully insert the 
                                      ///< desired samples to the buffer. If necessary, the function 
                                      ///< grows the buffer size to comply with this requirement.
                 );
diff --git a/include/SoundTouch.h b/include/SoundTouch.h
index ea33789..4f5e899 100644
--- a/include/SoundTouch.h
+++ b/include/SoundTouch.h
@@ -313,7 +313,7 @@ public:
     /// Changes a setting controlling the processing system behaviour. See the
     /// 'SETTING_...' defines for available setting ID's.
     /// 
-    /// \return 'true' if the setting was succesfully changed
+    /// \return 'true' if the setting was successfully changed
     bool setSetting(int settingId,   ///< Setting ID number. see SETTING_... defines.
                     int value        ///< New setting value.
                     );
diff --git a/source/SoundStretch/Makefile.am b/source/SoundStretch/Makefile.am
index d1698b7..a87e841 100644
--- a/source/SoundStretch/Makefile.am
+++ b/source/SoundStretch/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS=soundstretch
 
 noinst_HEADERS=RunParameters.h WavFile.h
 
-# extra files to include in distrubution tarball
+# extra files to include in distribution tarball
 EXTRA_DIST=soundstretch.dsp soundstretch.dsw soundstretch.sln soundstretch.vcproj
 
 ## for every name listed under bin_PROGRAMS, you have a <prog>_SOURCES. This lists
diff --git a/source/SoundTouch/BPMDetect.cpp b/source/SoundTouch/BPMDetect.cpp
index cad5dc7..f356ecf 100644
--- a/source/SoundTouch/BPMDetect.cpp
+++ b/source/SoundTouch/BPMDetect.cpp
@@ -254,7 +254,7 @@ void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
         buffer->putSamples(decimated, decSamples);
     }
 
-    // when the buffer has enought samples for processing...
+    // when the buffer has enough samples for processing...
     while ((int)buffer->numSamples() >= windowLen + xcorr_update_sequence) 
     {
         // ... calculate autocorrelations for oldest samples...
diff --git a/source/SoundTouch/FIFOSampleBuffer.cpp b/source/SoundTouch/FIFOSampleBuffer.cpp
index 1362171..f0d5e42 100644
--- a/source/SoundTouch/FIFOSampleBuffer.cpp
+++ b/source/SoundTouch/FIFOSampleBuffer.cpp
@@ -124,7 +124,7 @@ void FIFOSampleBuffer::putSamples(uint nSamples)
 //
 // Parameter 'slackCapacity' tells the function how much free capacity (in
 // terms of samples) there _at least_ should be, in order to the caller to
-// succesfully insert all the required samples to the buffer. When necessary, 
+// successfully insert all the required samples to the buffer. When necessary, 
 // the function grows the buffer size to comply with this requirement.
 //
 // When using this function as means for inserting new samples, also remember 
@@ -151,7 +151,7 @@ SAMPLETYPE *FIFOSampleBuffer::ptrBegin()
 }
 
 
-// Ensures that the buffer has enought capacity, i.e. space for _at least_
+// Ensures that the buffer has enough capacity, i.e. space for _at least_
 // 'capacityRequirement' number of samples. The buffer is grown in steps of
 // 4 kilobytes to eliminate the need for frequently growing up the buffer,
 // as well as to round the buffer size up to the virtual memory page size.
diff --git a/source/SoundTouch/RateTransposer.h b/source/SoundTouch/RateTransposer.h
index 382b3ce..dca7429 100644
--- a/source/SoundTouch/RateTransposer.h
+++ b/source/SoundTouch/RateTransposer.h
@@ -131,7 +131,7 @@ public:
 
     /// Use this function instead of "new" operator to create a new instance of this class. 
     /// This function automatically chooses a correct implementation, depending on if 
-    /// integer ot floating point arithmetics are to be used.
+    /// integer or floating point arithmetics are to be used.
 //    static RateTransposer *newInstance();
 
     /// Returns the output buffer object
diff --git a/source/SoundTouch/TDStretch.cpp b/source/SoundTouch/TDStretch.cpp
index 277bff5..149cdb9 100644
--- a/source/SoundTouch/TDStretch.cpp
+++ b/source/SoundTouch/TDStretch.cpp
@@ -360,7 +360,7 @@ int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos)
 // with improved precision
 //
 // Based on testing:
-// - This algorithm gives on average 99% as good match as the full algorith
+// - This algorithm gives on average 99% as good match as the full algorithm
 // - this quick seek algorithm finds the best match on ~90% of cases
 // - on those 10% of cases when this algorithm doesn't find best match, 
 //   it still finds on average ~90% match vs. the best possible match
@@ -517,7 +517,7 @@ void TDStretch::clearCrossCorrState()
 void TDStretch::calcSeqParameters()
 {
     // Adjust tempo param according to tempo, so that variating processing sequence length is used
-    // at varius tempo settings, between the given low...top limits
+    // at various tempo settings, between the given low...top limits
     #define AUTOSEQ_TEMPO_LOW   0.5     // auto setting low tempo range (-50%)
     #define AUTOSEQ_TEMPO_TOP   2.0     // auto setting top tempo range (+100%)
 
diff --git a/source/SoundTouchDLL/SoundTouchDLL.cpp b/source/SoundTouchDLL/SoundTouchDLL.cpp
index 3adf331..6b5f4bb 100644
--- a/source/SoundTouchDLL/SoundTouchDLL.cpp
+++ b/source/SoundTouchDLL/SoundTouchDLL.cpp
@@ -304,7 +304,7 @@ SOUNDTOUCHDLL_API void __cdecl soundtouch_clear(HANDLE h)
 /// Changes a setting controlling the processing system behaviour. See the
 /// 'SETTING_...' defines for available setting ID's.
 /// 
-/// \return 'nonzero' if the setting was succesfully changed
+/// \return 'nonzero' if the setting was successfully changed
 SOUNDTOUCHDLL_API int __cdecl soundtouch_setSetting(HANDLE h, 
         int settingId,   ///< Setting ID number. see SETTING_... defines.
         int value        ///< New setting value.
@@ -480,7 +480,7 @@ SOUNDTOUCHDLL_API void __cdecl bpm_putSamples(HANDLE h,
 
 
 /// Feed 'numSamples' sample frames from 'samples' into the BPM detection handler.
-/// 16bit int sample format verson.
+/// 16bit int sample format version.
 SOUNDTOUCHDLL_API void __cdecl bpm_putSamples_i16(HANDLE h, 
         const short *samples,
         unsigned int numSamples)
diff --git a/source/SoundTouchDLL/SoundTouchDLL.h b/source/SoundTouchDLL/SoundTouchDLL.h
index 3c1167f..5932dc8 100644
--- a/source/SoundTouchDLL/SoundTouchDLL.h
+++ b/source/SoundTouchDLL/SoundTouchDLL.h
@@ -153,7 +153,7 @@ SOUNDTOUCHDLL_API void __cdecl soundtouch_clear(HANDLE h);
 /// Changes a setting controlling the processing system behaviour. See the
 /// 'SETTING_...' defines for available setting ID's.
 /// 
-/// \return 'nonzero' if the setting was succesfully changed, otherwise zero
+/// \return 'nonzero' if the setting was successfully changed, otherwise zero
 SOUNDTOUCHDLL_API int __cdecl soundtouch_setSetting(HANDLE h, 
         int settingId,   ///< Setting ID number. see SETTING_... defines.
         int value        ///< New setting value.
@@ -210,7 +210,7 @@ SOUNDTOUCHDLL_API void __cdecl bpm_putSamples(HANDLE h,
         );
 
 /// Feed 'numSamples' sample frames from 'samples' into the BPM detector.
-/// 16bit int sample format verson.
+/// 16bit int sample format version.
 SOUNDTOUCHDLL_API void __cdecl bpm_putSamples_i16(HANDLE h, 
         const short *samples,           ///< Pointer to sample buffer.
         unsigned int numSamples         ///< Number of samples in buffer. Notice
diff --git a/source/SoundTouchDLL/SoundTouchDLL.pas b/source/SoundTouchDLL/SoundTouchDLL.pas
index 93ffbff..48e6251 100644
--- a/source/SoundTouchDLL/SoundTouchDLL.pas
+++ b/source/SoundTouchDLL/SoundTouchDLL.pas
@@ -114,7 +114,7 @@ type
   // Changes a setting controlling the processing system behaviour. See the
   // 'SETTING_...' defines for available setting ID's.
   //
-  // \return 'TRUE' if the setting was succesfully changed
+  // \return 'TRUE' if the setting was successfully changed
   TSoundTouchSetSetting = function (Handle: TSoundTouchHandle;
                                  SettingId: Integer;   //< Setting ID number. see SETTING_... defines.
                                  Value: Integer        //< New setting value.
diff --git a/source/csharp-example/MainWindow.xaml.cs b/source/csharp-example/MainWindow.xaml.cs
index 5028cf4..74df8d7 100644
--- a/source/csharp-example/MainWindow.xaml.cs
+++ b/source/csharp-example/MainWindow.xaml.cs
@@ -39,7 +39,7 @@ namespace csharp_example
 
 
         /// <summary>
-        /// Display SoundTouch library version string in status bar. This also indicates whether the DLL was loaded succesfully or not ...
+        /// Display SoundTouch library version string in status bar. This also indicates whether the DLL was loaded successfully or not ...
         /// </summary>
         private void DisplaySoundTouchVersion()
         {
diff --git a/source/csharp-example/SoundProcessor.cs b/source/csharp-example/SoundProcessor.cs
index 7bc2a70..d8f4d42 100644
--- a/source/csharp-example/SoundProcessor.cs
+++ b/source/csharp-example/SoundProcessor.cs
@@ -185,7 +185,7 @@ namespace csharp_example
         /// <summary>
         /// Start / resume playback
         /// </summary>
-        /// <returns>true if succesful, false if audio file not open</returns>
+        /// <returns>true if successful, false if audio file not open</returns>
         public bool Play()
         {
             if (waveOut == null) return false;
@@ -201,7 +201,7 @@ namespace csharp_example
         /// <summary>
         /// Pause playback
         /// </summary>
-        /// <returns>true if succesful, false if audio not playing</returns>
+        /// <returns>true if successful, false if audio not playing</returns>
         public bool Pause()
         {
             if (waveOut == null) return false;
@@ -218,7 +218,7 @@ namespace csharp_example
         /// <summary>
         /// Stop playback
         /// </summary>
-        /// <returns>true if succesful, false if audio file not open</returns>
+        /// <returns>true if successful, false if audio file not open</returns>
         public bool Stop()
         {
             if (waveOut == null) return false;
@@ -238,7 +238,7 @@ namespace csharp_example
 
 
         /// <summary>
-        /// Proxy event handler for receiving playback stoped event from WaveOut
+        /// Proxy event handler for receiving playback stopped event from WaveOut
         /// </summary>
         protected void EventHandler_stopped(object sender, StoppedEventArgs args)
         {