diff --git a/Android.mk b/Android.mk
index cda9500..8df6faa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,7 @@ RUBBERBAND_SRC_FILES := \
         $(RUBBERBAND_SRC_PATH)/StretcherProcess.cpp \
         $(RUBBERBAND_SRC_PATH)/StretchCalculator.cpp \
         $(RUBBERBAND_SRC_PATH)/RubberBandStretcher.cpp \
+        $(RUBBERBAND_SRC_PATH)/rubberband-c.cpp \
         $(RUBBERBAND_SRC_PATH)/speex/resample.c
 
 LOCAL_SRC_FILES += \
diff --git a/CHANGELOG b/CHANGELOG
index 5c553ae..8545d5f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Changes in Rubber Band v1.8.2
 The API is unchanged and the library is binary compatible with
 version 1.7.
 
-	
+
 Changes in Rubber Band v1.8.1
 
  * Fix a crash in formant-preserving pitch shift for some build targets
diff --git a/Doxyfile b/Doxyfile
index 95d2485..ddcc405 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Rubber Band Library"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.8.1
+PROJECT_NUMBER         = 1.8.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/README.txt b/README.txt
index 9083a26..f7b656b 100644
--- a/README.txt
+++ b/README.txt
@@ -258,6 +258,9 @@ use the Accelerate framework and the Speex resampler.  Then run
 e.g. "make -f Makefile.osx library" in a terminal window to build.
 You will need the Xcode command-line tools installed.
 
+(You probably don't want to use the configure script on macOS -- just
+use Makefile.osx directly.)
+
 The following Makefile targets are available:
 
   static  -- build static libraries only
@@ -338,6 +341,10 @@ interface (i.e. the Android NDK).
 The Java side of the interface can be found in
 com/breakfastquay/rubberband/RubberBandStretcher.java.
 
+See
+https://bitbucket.org/breakfastquay/rubberband-android-simple-sample
+for a very trivial example of integration with Android Java code.
+
 The supplied .mk file uses KissFFT and the Speex resampler.
 
 
diff --git a/configure b/configure
index 029c1fa..f801d1c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for RubberBand 1.8.1.
+# Generated by GNU Autoconf 2.69 for RubberBand 1.8.2.
 #
 # Report bugs to <chris.cannam@breakfastquay.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='RubberBand'
 PACKAGE_TARNAME='rubberband'
-PACKAGE_VERSION='1.8.1'
-PACKAGE_STRING='RubberBand 1.8.1'
+PACKAGE_VERSION='1.8.2'
+PACKAGE_STRING='RubberBand 1.8.2'
 PACKAGE_BUGREPORT='chris.cannam@breakfastquay.com'
 PACKAGE_URL=''
 
@@ -1253,7 +1253,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RubberBand 1.8.1 to adapt to many kinds of systems.
+\`configure' configures RubberBand 1.8.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1314,7 +1314,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RubberBand 1.8.1:";;
+     short | recursive ) echo "Configuration of RubberBand 1.8.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1411,7 +1411,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-RubberBand configure 1.8.1
+RubberBand configure 1.8.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1705,7 +1705,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RubberBand $as_me 1.8.1, which was
+It was created by RubberBand $as_me 1.8.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3846,8 +3846,8 @@ $as_echo "no" >&6; }
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRC" >&5
-$as_echo_n "checking for SRC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5
+$as_echo_n "checking for samplerate... " >&6; }
 
 if test -n "$SRC_CFLAGS"; then
     pkg_cv_SRC_CFLAGS="$SRC_CFLAGS"
@@ -3887,7 +3887,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -3914,7 +3914,7 @@ Alternatively, you may set the environment variables SRC_CFLAGS
 and SRC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -3940,8 +3940,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
-$as_echo_n "checking for SNDFILE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sndfile" >&5
+$as_echo_n "checking for sndfile... " >&6; }
 
 if test -n "$SNDFILE_CFLAGS"; then
     pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
@@ -3981,7 +3981,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -4008,7 +4008,7 @@ Alternatively, you may set the environment variables SNDFILE_CFLAGS
 and SNDFILE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -4034,8 +4034,8 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW" >&5
-$as_echo_n "checking for FFTW... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5
+$as_echo_n "checking for fftw3... " >&6; }
 
 if test -n "$FFTW_CFLAGS"; then
     pkg_cv_FFTW_CFLAGS="$FFTW_CFLAGS"
@@ -4075,7 +4075,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -4102,7 +4102,7 @@ Alternatively, you may set the environment variables FFTW_CFLAGS
 and FFTW_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -4153,8 +4153,8 @@ done
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Vamp" >&5
-$as_echo_n "checking for Vamp... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vamp-sdk" >&5
+$as_echo_n "checking for vamp-sdk... " >&6; }
 
 if test -n "$Vamp_CFLAGS"; then
     pkg_cv_Vamp_CFLAGS="$Vamp_CFLAGS"
@@ -4194,7 +4194,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -4221,7 +4221,7 @@ Alternatively, you may set the environment variables Vamp_CFLAGS
 and Vamp_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -4801,7 +4801,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by RubberBand $as_me 1.8.1, which was
+This file was extended by RubberBand $as_me 1.8.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4854,7 +4854,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-RubberBand config.status 1.8.1
+RubberBand config.status 1.8.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/rubberband.pc.in b/rubberband.pc.in
index a4ebe30..ac96edd 100644
--- a/rubberband.pc.in
+++ b/rubberband.pc.in
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: rubberband
-Version: 1.8.1
+Version: 1.8.2
 Description: 
 Libs: -L${libdir} -lrubberband
 Cflags: -I${includedir}