diff --git a/android/Snapcast/build.gradle b/android/Snapcast/build.gradle
index 6412b047..61d0e95f 100644
--- a/android/Snapcast/build.gradle
+++ b/android/Snapcast/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.badaix.snapcast"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 990
-        versionName "0.9.90"
+        versionCode 1000
+        versionName "0.10.0"
         multiDexEnabled true
     }
     buildTypes {
diff --git a/client/Makefile b/client/Makefile
index e571fc6a..f62c9ace 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.9.90
+VERSION = 0.10.0
 TARGET  = snapclient
 ifeq ($(TARGET), FREEBSD)
 SHELL   = /usr/local/bin/bash
diff --git a/client/debian/changelog b/client/debian/changelog
index 2f8f247c..9650b504 100644
--- a/client/debian/changelog
+++ b/client/debian/changelog
@@ -1,9 +1,17 @@
-snapclient (0.9.90) unstable; urgency=low
+snapclient (0.10.0) unstable; urgency=low
 
   * Features
-    -Added support "process" streams
+    -Added support "process" streams: 
+     Snapserver starts a process and reads PCM data from stdout 
+    -Specialized versions for Spotify "spotify" and AirPlay "airplay"
+  * Bugfixes
+    -Fixed crash during server shutdown
+    -Fixed Makefile for FreeBSD
+    -Fixed building of dpk (unsigned .changes file)
+  * General
+    -Speed up client and server shutdown
 
- -- Johannes Pohl <johannes.pohl@badaix.de>  Sat, 22 Oct 2016 00:13:37 +0200
+ -- Johannes Pohl <johannes.pohl@badaix.de>  Wed, 16 Nov 2016 00:13:37 +0200
 
 snapclient (0.9.0) unstable; urgency=low
 
diff --git a/openWrt/Makefile.openwrt b/openWrt/Makefile.openwrt
index db38f37e..e92d761a 100755
--- a/openWrt/Makefile.openwrt
+++ b/openWrt/Makefile.openwrt
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME := snapcast
-PKG_VERSION := 0.9.90
+PKG_VERSION := 0.10.0
 PKG_RELEASE := $(PKG_SOURCE_VERSION)
 PKG_USE_MIPS16 := 0
 
diff --git a/server/Makefile b/server/Makefile
index afc6b949..cfa2d45f 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.9.90
+VERSION = 0.10.0
 TARGET  = snapserver
 ifeq ($(TARGET), FREEBSD)
 SHELL   = /usr/local/bin/bash
diff --git a/server/debian/changelog b/server/debian/changelog
index 09d661d2..a3dab79c 100644
--- a/server/debian/changelog
+++ b/server/debian/changelog
@@ -1,9 +1,17 @@
-snapserver (0.9.90) unstable; urgency=low
+snapclient (0.10.0) unstable; urgency=low
 
   * Features
-    -Added support "process" streams
+    -Added support "process" streams: 
+     Snapserver starts a process and reads PCM data from stdout 
+    -Specialized versions for Spotify "spotify" and AirPlay "airplay"
+  * Bugfixes
+    -Fixed crash during server shutdown
+    -Fixed Makefile for FreeBSD
+    -Fixed building of dpk (unsigned .changes file)
+  * General
+    -Speed up client and server shutdown
 
- -- Johannes Pohl <johannes.pohl@badaix.de>  Sat, 22 Oct 2016 00:13:37 +0200
+ -- Johannes Pohl <johannes.pohl@badaix.de>  Wed, 16 Nov 2016 00:13:37 +0200
 
 snapserver (0.9.0) unstable; urgency=low
 
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index 8f213c09..66f00b05 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -378,7 +378,6 @@ void StreamServer::start()
 
 		streamManager_.reset(new StreamManager(this, settings_.sampleFormat, settings_.codec, settings_.streamReadMs));
 //	throw SnapException("xxx");
-		//TODO: check uniqueness of the stream
 		for (const auto& streamUri: settings_.pcmStreams)
 		{
 			PcmStreamPtr stream = streamManager_->addStream(streamUri);
diff --git a/server/streamreader/process.hpp b/server/streamreader/process.hpp
index df98e041..c2e39af4 100644
--- a/server/streamreader/process.hpp
+++ b/server/streamreader/process.hpp
@@ -8,9 +8,11 @@
 #include <unistd.h>
 #include <signal.h>
 
+// Forked from: https://github.com/eidheim/tiny-process-library
+// Copyright (c) 2015-2016 Ole Christian Eidheim
+// Thanks, Christian :-)
 
 ///Create a new process given command and run path.
-///TODO: on Windows it is harder to specify which pipes to redirect.
 ///Thus, at the moment, if read_stdout==nullptr, read_stderr==nullptr and open_stdin==false,
 ///the stdout, stderr and stdin are sent to the parent process instead.
 ///Compile with -DMSYS_PROCESS_USE_SH to run command using "sh -c [command]" on Windows as well.
@@ -178,8 +180,6 @@ private:
 				close(fd);
 
 			setpgid(0, 0);
-			//TODO: See here on how to emulate tty for colors: http://stackoverflow.com/questions/1401002/trick-an-application-into-thinking-its-stdin-is-interactive-not-a-pipe
-			//TODO: One solution is: echo "command;exit"|script -q /dev/null
 			
 			if (!path.empty()) 
 			{
diff --git a/server/streamreader/spotifyStream.cpp b/server/streamreader/spotifyStream.cpp
index 2cccbffa..3c45150e 100644
--- a/server/streamreader/spotifyStream.cpp
+++ b/server/streamreader/spotifyStream.cpp
@@ -76,7 +76,7 @@ void SpotifyStream::initExeAndPath(const std::string& filename)
 
 void SpotifyStream::onStderrMsg(const char* buffer, size_t n)
 {
-	/// TODO: Watch dog needed. Kill librespot if there was no message received for 70min
+	/// Watch will kill librespot if there was no message received for 130min
 	// 2016-11-02 22-05-15 [out] TRACE:librespot::stream: allocated stream 3580
 	// 2016-11-02 22-05-15 [Debug] DEBUG:librespot::audio_file2: Got channel 3580
 	// 2016-11-02 22-06-39 [out] DEBUG:librespot::spirc: kMessageTypeHello "SM-G901F" 5e1ffdd73f0d1741c4a173d5b238826464ca8e2f 1 0