diff --git a/android/Snapcast/src/main/assets/bin/armeabi-v7a/snapclient b/android/Snapcast/src/main/assets/bin/armeabi-v7a/snapclient
index bf910832..258f6487 100755
Binary files a/android/Snapcast/src/main/assets/bin/armeabi-v7a/snapclient and b/android/Snapcast/src/main/assets/bin/armeabi-v7a/snapclient differ
diff --git a/android/Snapcast/src/main/assets/bin/armeabi/snapclient b/android/Snapcast/src/main/assets/bin/armeabi/snapclient
index 6cc7c04f..619e7d25 100755
Binary files a/android/Snapcast/src/main/assets/bin/armeabi/snapclient and b/android/Snapcast/src/main/assets/bin/armeabi/snapclient differ
diff --git a/client/Makefile b/client/Makefile
index 62955e1b..0b00bd62 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -26,13 +26,15 @@ ifdef ANDROID
 #    ii. ./make-standalone-toolchain.sh --arch=arm --platform=android-14 --install-dir=/home/johannes/Develop/android-toolchain-arm-14 --ndk-dir=/home/johannes/Develop/android-ndk-r10e --system=linux-x86_64
 # build with:
 #    make ANDROID=1
-CXX     = /home/johannes/Develop/android-toolchain-arm-14/bin/arm-linux-androideabi-g++
+CXX     = $(NDK_DIR)/bin/arm-linux-androideabi-g++
+STRIP	= $(NDK_DIR)/bin/arm-linux-androideabi-strip
 CFLAGS  = $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function -fPIC -O3 -pthread -DASIO_STANDALONE -DANDROID -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include -I/home/johannes/Develop/build/arm/include
 #-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16
 LDFLAGS = -L/home/johannes/Develop/build/arm/lib -pie -lFLAC -lOpenSLES
 OBJ     = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o player/openslPlayer.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
 else
 CXX     = /usr/bin/g++
+STRIP	= strip
 CFLAGS  = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include
 LDFLAGS = -lrt -lasound -logg -lvorbis -lFLAC -lavahi-client -lavahi-common
 OBJ     = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o player/alsaPlayer.o decoder/oggDecoder.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
@@ -45,7 +47,7 @@ all:	$(TARGET)
 
 $(TARGET): $(OBJ)
 	$(CXX) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS)
-#	strip $(BIN)
+	$(STRIP) $(BIN)
 
 %.o: %.cpp
 	$(CXX) $(CFLAGS) -c $< -o $@
diff --git a/client/build_android.sh b/client/build_android.sh
index 9bc0e9a8..f0c7bc05 100755
--- a/client/build_android.sh
+++ b/client/build_android.sh
@@ -1,3 +1,4 @@
+export NDK_DIR="/home/johannes/Develop/android-toolchain-arm-14"
 export ADD_CFLAGS=""
 make clean; make ANDROID=1 -j 3; cp ./snapclient ../android/Snapcast/src/main/assets/bin/armeabi/
 export ADD_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
diff --git a/client/player/openslPlayer.cpp b/client/player/openslPlayer.cpp
index 922c2c83..4240951e 100644
--- a/client/player/openslPlayer.cpp
+++ b/client/player/openslPlayer.cpp
@@ -191,7 +191,7 @@ void OpenslPlayer::initOpensl()
 
 	const SampleFormat& format = stream_->getFormat();
 
-	frames_ = 960;//rate / 50; // => 50ms
+	frames_ = 1920;//960;//rate / 50; // => 50ms
 
 	buff_size = frames_ * format.channels * 2 /* 2 -> sample size */;
 	logO << "frames: " << frames_ << ", channels: " << format.channels << ", rate: " << format.rate << ", buff: " << buff_size << "\n";