diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e0d85257c37145f63cd2cf79e53628022bff762b
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,15 @@
+=========
+Changelog
+=========
+
+Version 0.9
+-----------
+Version 0.9.1
+*************
+
+- Bug: Wrong gamma calculation for staggered grid.
+- Bug: No optimal gamma calculation for tensor method.
+
+Version 0.9.0
+*************
+Initial release
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 434d3bd63a420b189c6d41fe2d5d64479bcb0944..0010fee0f0d0f9e2777c46e4ff34e2e1e4cb589c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ add_compile_options("$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:C>,$<C_COMPILER_
 add_compile_options("$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra>")
 
 project(ALL
-    VERSION "0.9.0"
+    VERSION "0.9.1"
     DESCRIPTION "A Loadbalacing Library"
     HOMEPAGE_URL "http://slms.pages.jsc.fz-juelich.de/websites/all-website/")
 
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
new file mode 120000
index 0000000000000000000000000000000000000000..e22698baf7ce3f3290d2a6744ff21e4699a8e8ba
--- /dev/null
+++ b/docs/Changelog.rst
@@ -0,0 +1 @@
+../CHANGELOG.rst
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index d929da7afa7d410718de8ac19e67da8492e170c0..9880b5c808d2813ac2bbea078d0f49279d12ec7f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,6 +14,7 @@ Welcome to the documentation of ALL
   Install.rst
   Usage.rst
   Examples.rst
+  Changelog.rst
   api/index.rst
   methods/index.rst
   modules/index.rst
diff --git a/include/ALL_Staggered.hpp b/include/ALL_Staggered.hpp
index ea364821cf000aa2e4c5c49b6165fb2db77c66ca..75c38de0da6e4a5c1513aba0fb63b4ac4a546c6c 100644
--- a/include/ALL_Staggered.hpp
+++ b/include/ALL_Staggered.hpp
@@ -266,7 +266,7 @@ template <class T, class W> void Staggered_LB<T, W>::balance(int) {
     // automatic selection of gamma to guarantee stability of method (choice of
     // user gamma ignored)
     this->gamma =
-        std::max(4.1, 1.1 * (1.0 + std::max(local_size, remote_size) /
+        std::max(4.1, 2.0 * (1.0 + std::max(local_size, remote_size) /
                                        std::min(local_size, remote_size)));
 
 #ifdef ALL_DEBUG_ENABLED
diff --git a/include/ALL_Tensor.hpp b/include/ALL_Tensor.hpp
index c5ca109f2e0195012027787eb2d5f4a00ab8eae2..a328d64dc97f27583ea15a75b7c0891dca42e10f 100644
--- a/include/ALL_Tensor.hpp
+++ b/include/ALL_Tensor.hpp
@@ -216,6 +216,12 @@ template <class T, class W> void Tensor_LB<T, W>::balance(int) {
     MPI_Wait(&sreq, &sstat);
     MPI_Wait(&rreq, &rstat);
 
+    // automatic selection of gamma to guarantee stability of method (choice of
+    // user gamma ignored)
+    this->gamma =
+        std::max(4.1, 2.0 * (1.0 + std::max(local_size, remote_size) /
+                                       std::min(local_size, remote_size)));
+
     T shift = Functions::borderShift1d(
         rank_right, this->local_coords.at(i), this->global_dims.at(i),
         work_local_plane, remote_work, local_size, remote_size, this->gamma,