diff --git a/ELPA_2014.06/INSTALL b/ELPA_2014.06/INSTALL
index dd3c3bb5799f26a73d046a717527d503bf47b4f1..fcef67d47914270a033563de37bdc4f110b58720 100644
--- a/ELPA_2014.06/INSTALL
+++ b/ELPA_2014.06/INSTALL
@@ -7,7 +7,9 @@ install ELPA as library, but to include it in your source code, please refer
 to point (B). An example makefile "Makefile.example" can be found in ./test, 
 to give some hints how this is done. Please distibute then all files of ELPA 
 with your code. Please note, that usage of ELPA as described in Section (B) 
-requires advanced knowledge about compilers, preprocessor flags, and optimizations.
+requires advanced knowledge about compilers, preprocessor flags, and
+optimizations. Please also not, that we cannot give any official support if
+ELPA is used as described in Section (B)!
 
 
 
@@ -20,20 +22,32 @@ The configure installation is best done in four steps
    
    Check the available options with "configure --help". 
    ELPA is shipped with several different versions of the
-   elpa2-kernel, each optimized and tuned for a different
-   architecture. Since, at the moment we do not want to
-   define a default, which works but maybe with less then
-   the optimal performance, it is MANDATORY that you choose
-   (real and complex kernels) for your system, via the
-   "--with-..." option. For hints which kernels might be best
-   for you, please refer to the file 
-   "./src/elpa2_kernels/README_elpa2_kernels.txt".
-   If no kernel is specified at the configure step an exception
-   prompting this error is thrown.
+   elpa2-kernel, each is optimized and tuned for a different
+   architecture.
+
+1.1) Choice of ELPA2 kernels
+
+   With this release of ELPA (2014.06 or newer) it is _not_
+   mandatory anymore to define the (real and complex) kernels
+   at build time. The configure procedure will build all the
+   kernels which can be used on the build system. The choice of 
+   the kernels is now a run-time option. This is the most 
+   convenient and also recommended way. It is intended to augment
+   this with an auto-tuning feature.
+
+   Nevertheless, one can still define at build-time _one_
+   specific kernel (for the real and the complex case each). 
+   Then, ELPA is configured only with this real (and complex) 
+   kernel, and all run-time checking is disabled. Have a look
+   at the "configure --help" messages and please refer to the
+   file "./src/elpa2_kernels/README_elpa2_kernels.txt".
+
+
+1.2 Setting up blacs/scalapack
 
    Please point to your blacs/scalapack installation and the
    linkline with the variables "BLACS_LDFLAGS" and "BLACS_FCFLAGS".
-   "BLACS_LDFLAGS" should then contain the correct linkline for your
+   "BLACS_LDFLAGS" should  contain the correct linkline for your
    blacs/scalapack installation and "BLACS_FCFLAGS" the include path
    and any other flags you need at compile time.
 
@@ -43,21 +57,36 @@ The configure installation is best done in four steps
 
    You can either specify your own builds of lapack/blacs/scalapack
    or use specialized Vendor packages, e.g. if available you can use 
-   Intel's MKL. If you do not set the variables "BLACS_LDFLAGS" and 
-   "BLACS_FCFLAGS" ELPA will not be build! 
+   Intel's MKL. 
+
+   The configure procedure will check whether blacs/scalapack is available
+   at build-time. If you do not set the variables "BLACS_LDFLAGS" and 
+   "BLACS_FCFLAGS" the chances are high that ELPA will not build.
+
+1.3 Setting optimizations
 
    Please set the optimisation that you would like with the
    variable "FCFLAGS", "CFLAGS", and "CXXFLAGS", e.g. FCFLAGS="-O3 -xAVX",
    please see "./src/elpa2_kernels/README_elpa2_kernels.txt".
 
+   Setting the optimization flags for the AVX kernels can be a hazel. If AVX 
+   kernels are build for your system, you can set the configure option
+   "--with-avx-optimizations=yes". This will automatically set a few compiler
+   optimization flags which turned out to be beneficial for AVX support.
+   However, it might be that on your system/compiler version etc. other flags
+   are the better choice.
+
+1.4 Installation location
+
    Set the "prefix" - flag, if you wish another installation location than
    the default "/usr/local/".
 
+1.5 Hybrid OpenMP support
+
    If you want to use the hybrid MPI/OpenMP version of ELPA please specify
-   "--enable-openmp" or "--with-openmp". Note that the Bluegene P/Q kernels
-   are not yet tested in the combination with OpenMP and thus at the moment
-   this combination is switched of. Please see ./src/elpa2_kernels/README_elpa2_kernels.txt for more details and a hint how to use it anyway.
+   "--enable-openmp" or "--with-openmp".
 
+1.6 Other
 
    Note, that at the moment we do not officially support "cross compilation"
    allthough it should work.
@@ -67,11 +96,16 @@ The configure installation is best done in four steps
 3) run "make check"
    a simple test of ELPA is done. At the moment the usage of "mpiexec"
    is required. If this is not possible at your system, you can run the
-   binaries "test_real", "test_real2", "test_complex", and "test_complex2"
+   binaries "test_real", "test_real2", "test_complex", "test_complex2",
+   "test_complex2_default_kernel", "test_complex2_choose_kernel_with_api",
+   "test_real2_default_kernel", and "test_real2_choose_kernel_with_api"
    yourself. At the moment the tests check whether the residual and the
    orthogonality of the found eigenvectors are lower than a threshold of
    5e-12. If this test fails, or if you believe the threshold should be
-   even lower, please talk to us.
+   even lower, please talk to us. Furthermore, your run-time choice of
+   ELPA kernels is tested. This is intended as a help to get used to this
+   new feature. With the same thought in mind a binary "print_available_elpa2_kernels"
+   is provided, which is rather self-explanatory.
 
 
 4) run "make install"
@@ -86,7 +120,7 @@ B) Installing ELPA without the autotools procedure
     If you do so, please distibute then all files of ELPA with your code.
 
     However, this is not the recommended way for several reasons:
-     - from the last release, ELPA has grown substantially in performance
+     - for several releases, ELPA has grown substantially in performance
        optimizations but also complexity. The simple "just use elpa source
        files in your code" approach is becoming more and more difficult.
     - you still have to choose an elpa2-kernel (see at (A)). Getting them
diff --git a/ELPA_2014.06/Makefile.am b/ELPA_2014.06/Makefile.am
index f0ecfc369c66c4301bfdd7a94433b454397b3db4..2a12c8b2b4574240d68a89f5eca6276ea9aa0ecd 100644
--- a/ELPA_2014.06/Makefile.am
+++ b/ELPA_2014.06/Makefile.am
@@ -176,11 +176,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = elpa.pc
 
 # test programs
-if WITH_OPENMP
-build_lib = libelpa_mt.la 
-else
-build_lib = libelpa.la 
-endif
 
 #bindir = $(abs_top_builddir)
 bin_PROGRAMS = test_real test_real2 test_real2_default_kernel test_complex test_complex2 test_complex2_default_kernel test_real2_choose_kernel_with_api test_complex2_choose_kernel_with_api print_available_elpa2_kernels
diff --git a/ELPA_2014.06/RELEASE_NOTES b/ELPA_2014.06/RELEASE_NOTES
new file mode 100644
index 0000000000000000000000000000000000000000..4652f73e3f5eb40f926c6d543e520572a7549459
--- /dev/null
+++ b/ELPA_2014.06/RELEASE_NOTES
@@ -0,0 +1,29 @@
+This file contains the release notes for the ELPA 2014.06.000 version
+
+
+
+What is new?
+-------------
+
+With this release (and newer) it is not mandatory anymore to specify the real
+and complex kernels at build-time! Instead the choice of kernel is now a
+run-time option
+
+The kernels can either be choosen by environment variables "REAL_ELPA_KERNEL" 
+and "COMPLEX_ELPA_KERNEL", or in the code with an additional argument in
+the call to the library (see the examples in ./test for more details)
+
+It is still possible to build ELPA with a specific real and complex kernel, if 
+one wants to obtain the old behaviour (see configure --help for the exact 
+options)
+
+
+Any incompatibles to previous version?
+---------------------------------------
+
+The ABI of ELPA has changed! It will be necessary to rebuild the programs using
+ELPA if this new version should be used. Beware, that not rebuilding the user 
+programs most likely leads to undefined behaviour!
+
+
+
diff --git a/ELPA_2014.06/configure b/ELPA_2014.06/configure
index f7e5481a39afa28cd6169e60a92e7be8598a5938..25a4109417aa562f10e54ed6148dfbc5fcd4ff2d 100755
--- a/ELPA_2014.06/configure
+++ b/ELPA_2014.06/configure
@@ -3057,7 +3057,8 @@ ELPA_LIB_VERSION=2014.06.000
 
 # this is the version of the API, should be changed in the major revision
 # if and only if the actual API changes
-ELPA_SO_VERSION=0:0:0
+# see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ELPA_SO_VERSION=1:0:0
 
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
@@ -3128,7 +3129,7 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "x${CPP_FOUND}" = xno; then
+if test x"${CPP_FOUND}" = xno; then
   as_fn_error $? "no cpp found" "$LINENO" 5
 fi
 
@@ -5579,7 +5580,7 @@ else
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "x${can_compile_avx}" = "xno"; then
+ if test x"${can_compile_avx}" = x"no"; then
  CFLAGS="$CFLAGS -mavx"
  CXXFLAGS="$CXXFLAGS -mavx"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5603,7 +5604,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_avx}" >&5
 $as_echo "${can_compile_avx}" >&6; }
 
-if test "x${can_compile_avx}" = "xyes"; then
+if test x"${can_compile_avx}" = x"yes"; then
   install_real_avx_block2=yes
   install_real_avx_block4=yes
   install_real_avx_block6=yes
@@ -5626,7 +5627,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_avx_optimization}" >&5
 $as_echo "${with_avx_optimization}" >&6; }
-if test "x${with_avx_optimization}" = xyes; then
+if test x"${with_avx_optimization}" = xyes; then
  CFLAGS="$CFLAGS -funsafe-loop-optimizations -funsafe-math-optimizations -ftree-vect-loop-version -ftree-vectorize"
  CXXFLAGS="$CXXFLAGS -funsafe-loop-optimizations -funsafe-math-optimizations -ftree-vect-loop-version -ftree-vectorize"
 fi
@@ -6128,7 +6129,7 @@ if test x"$_ax_prog_fc_mpi_mpi_found" = xyes; then :
 else
 
         have_mpi=no
-		 if test "x${have_mpi}" = xno; then
+		 if test x"${have_mpi}" = xno; then
   		  as_fn_error $? "no mpi found" "$LINENO" 5
 		  fi
         :
@@ -6341,7 +6342,7 @@ fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_openmp}" >&5
 $as_echo "${with_openmp}" >&6; }
-  if test "x${enable_openmp}" = xyes; then
+  if test x"${enable_openmp}" = xyes; then
      with_openmp=yes
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --enable-openmp is specified" >&5
 $as_echo_n "checking whether --enable-openmp is specified... " >&6; }
@@ -6356,7 +6357,7 @@ else
   WITH_OPENMP_FALSE=
 fi
 
-  if test "x${with_openmp}" = xyes; then
+  if test x"${with_openmp}" = xyes; then
 
 $as_echo "#define WITH_OPENMP 1" >>confdefs.h
 
@@ -6495,7 +6496,7 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo "${have_mkl}" >&6; }
 fi
 
-if test "x${have_mkl}" = "xyes" ; then
+if test x"${have_mkl}" = x"yes" ; then
   WITH_MKL=1
 else
 
@@ -6549,7 +6550,7 @@ $as_echo_n "checking whether we can link a program with a blas lib... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_blas}" >&5
 $as_echo "${have_blas}" >&6; }
 
-  if test "x${have_blas}" = "xno" ; then
+  if test x"${have_blas}" = x"no" ; then
     as_fn_error $? "could not link with blas: specify path" "$LINENO" 5
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlarrv" >&5
@@ -6602,7 +6603,7 @@ $as_echo_n "checking whether we can link a program with a lapack lib... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_lapack}" >&5
 $as_echo "${have_lapack}" >&6; }
 
-  if test "x${have_lapack}" = "xno" ; then
+  if test x"${have_lapack}" = x"no" ; then
     as_fn_error $? "could not link with lapack: specify path" "$LINENO" 5
   fi
 
@@ -6658,7 +6659,7 @@ $as_echo "${have_blacs}" >&6; }
 
 
 
-  if test "x${have_blacs}" = "xno" ; then
+  if test x"${have_blacs}" = x"no" ; then
     as_fn_error $? "could not link with blacs: specify path" "$LINENO" 5
   fi
 
@@ -6712,7 +6713,7 @@ $as_echo_n "checking whether we can link a program with a scalapack lib... " >&6
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_scalapack}" >&5
 $as_echo "${have_scalapack}" >&6; }
 
-  if test "x${have_scalapack}" = "xno" ; then
+  if test x"${have_scalapack}" = x"no" ; then
     as_fn_error $? "could not link with scalapack: specify path" "$LINENO" 5
   fi
 
@@ -6744,7 +6745,7 @@ rm -f core conftest.err conftest.$ac_objext \
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_link_with_blacs_scalapack}" >&5
 $as_echo "${can_link_with_blacs_scalapack}" >&6; }
 
-   if test "x${can_link_with_blacs_scalapack}" = "xyes" ; then
+   if test x"${can_link_with_blacs_scalapack}" = x"yes" ; then
      WITH_BLACS=1
    else
    as_fn_error $? "We can neither link with MKL or another Scalpack. Please specify BLACS_LDFLAGS and BLACS_FCFLAGS!" "$LINENO" 5
@@ -6805,7 +6806,7 @@ rm -f core conftest.err conftest.$ac_objext \
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_bgp}" >&5
 $as_echo "${can_compile_bgp}" >&6; }
 
-if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${can_compile_bgp}" = x"yes" ; then
   install_real_bgp=yes
   install_complex_bgp=yes
 fi
@@ -6834,13 +6835,13 @@ rm -f core conftest.err conftest.$ac_objext \
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${can_compile_bgq}" >&5
 $as_echo "${can_compile_bgq}" >&6; }
 
-if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${can_compile_bgq}" = x"yes" ; then
   install_real_bgq=yes
   install_complex_bgq=yes
 fi
 
 
-if test "x${fortran_can_check_environment}" = "xyes" ; then
+if test x"${fortran_can_check_environment}" = x"yes" ; then
 
 $as_echo "#define HAVE_ENVIRONMENT_CHECKING 1" >>confdefs.h
 
@@ -6855,9 +6856,9 @@ else
 fi
 
 
-if test "${with_real_generic_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-#  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_real_generic_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+#  if test x"${can_compile_sse}" = x"yes" ; then
 
         install_real_generic=yes
     install_real_generic_simple=no
@@ -6891,8 +6892,8 @@ else
 fi
 
 
-if test "${with_real_generic_simple_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
+if test x"${with_real_generic_simple_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
 
         install_real_generic=no
     install_real_generic_simple=yes
@@ -6924,9 +6925,9 @@ else
 fi
 
 
-if test "${with_real_sse_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_real_sse_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_sse}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -6963,9 +6964,9 @@ else
 fi
 
 
-if test "${with_real_bgp_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${with_real_bgp_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_bgp}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -7002,9 +7003,9 @@ else
 fi
 
 
-if test "${with_real_bgq_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${with_real_bgq_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_bgq}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -7041,9 +7042,9 @@ else
 fi
 
 
-if test "${with_real_avx_block2_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block2_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -7080,9 +7081,9 @@ else
 fi
 
 
-if test "${with_real_avx_block4_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block4_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -7119,9 +7120,9 @@ else
 fi
 
 
-if test "${with_real_avx_block6_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block6_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
         install_real_generic=no
     install_real_generic_simple=no
@@ -7159,8 +7160,8 @@ else
 fi
 
 
-if test "${with_complex_generic_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
+if test x"${with_complex_generic_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
 
         install_complex_generic=yes
     install_complex_generic_simple=no
@@ -7191,8 +7192,8 @@ else
 fi
 
 
-if test "${with_complex_generic_simple_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
+if test x"${with_complex_generic_simple_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=yes
@@ -7224,9 +7225,9 @@ else
 fi
 
 
-if test "${with_complex_sse_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_complex_sse_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_sse}" = x"yes" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=no
@@ -7263,9 +7264,9 @@ else
 fi
 
 
-if test "${with_complex_bgp_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${with_complex_bgp_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_bgp}" = x"yes" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=no
@@ -7303,9 +7304,9 @@ else
 fi
 
 
-if test "${with_complex_bgq_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${with_complex_bgq_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_bgq}" = x"yes" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=no
@@ -7342,9 +7343,9 @@ else
 fi
 
 
-if test "${with_complex_avx_block1_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_complex_avx_block1_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=no
@@ -7379,9 +7380,9 @@ else
 fi
 
 
-if test "${with_complex_avx_block2_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_complex_avx_block2_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
         install_complex_generic=no
     install_complex_generic_simple=no
@@ -7408,7 +7409,7 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 
-if test "x${can_use_iso_fortran_env}" = "xyes" ; then
+if test x"${can_use_iso_fortran_env}" = x"yes" ; then
 
 $as_echo "#define HAVE_ISO_FORTRAN_ENV 1" >>confdefs.h
 
@@ -7423,7 +7424,7 @@ else
   WITH_REAL_GENERIC_KERNEL_FALSE=
 fi
 
-if test "x${install_real_generic}" = "xyes" ; then
+if test x"${install_real_generic}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_GENERIC_KERNEL 1" >>confdefs.h
 
@@ -7437,7 +7438,7 @@ else
   WITH_COMPLEX_GENERIC_KERNEL_FALSE=
 fi
 
-if test "x${install_complex_generic}" = "xyes" ; then
+if test x"${install_complex_generic}" = x"yes" ; then
 
 $as_echo "#define WITH_COMPLEX_GENERIC_KERNEL 1" >>confdefs.h
 
@@ -7451,7 +7452,7 @@ else
   WITH_REAL_GENERIC_SIMPLE_KERNEL_FALSE=
 fi
 
-if test "x${install_real_generic_simple}" = "xyes" ; then
+if test x"${install_real_generic_simple}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_GENERIC_SIMPLE_KERNEL 1" >>confdefs.h
 
@@ -7465,7 +7466,7 @@ else
   WITH_COMPLEX_GENERIC_SIMPLE_KERNEL_FALSE=
 fi
 
-if test "x${install_complex_generic_simple}" = "xyes" ; then
+if test x"${install_complex_generic_simple}" = x"yes" ; then
 
 $as_echo "#define WITH_COMPLEX_GENERIC_SIMPLE_KERNEL 1" >>confdefs.h
 
@@ -7479,7 +7480,7 @@ else
   WITH_REAL_SSE_KERNEL_FALSE=
 fi
 
-if test "x${install_real_sse}" = "xyes" ; then
+if test x"${install_real_sse}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_SSE_KERNEL 1" >>confdefs.h
 
@@ -7493,7 +7494,7 @@ else
   WITH_COMPLEX_SSE_KERNEL_FALSE=
 fi
 
-if test "x${install_complex_sse}" = "xyes" ; then
+if test x"${install_complex_sse}" = x"yes" ; then
 
 $as_echo "#define WITH_COMPLEX_SSE_KERNEL 1" >>confdefs.h
 
@@ -7507,7 +7508,7 @@ else
   WITH_REAL_AVX_BLOCK2_KERNEL_FALSE=
 fi
 
-if test "x${install_real_avx_block2}" = "xyes" ; then
+if test x"${install_real_avx_block2}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_AVX_BLOCK2_KERNEL 1" >>confdefs.h
 
@@ -7521,7 +7522,7 @@ else
   WITH_REAL_AVX_BLOCK4_KERNEL_FALSE=
 fi
 
-if test "x${install_real_avx_block4}" = "xyes" ; then
+if test x"${install_real_avx_block4}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_AVX_BLOCK4_KERNEL 1" >>confdefs.h
 
@@ -7535,7 +7536,7 @@ else
   WITH_REAL_AVX_BLOCK6_KERNEL_FALSE=
 fi
 
-if test "x${install_real_avx_block6}" = "xyes" ; then
+if test x"${install_real_avx_block6}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_AVX_BLOCK6_KERNEL 1" >>confdefs.h
 
@@ -7549,7 +7550,7 @@ else
   WITH_COMPLEX_AVX_BLOCK1_KERNEL_FALSE=
 fi
 
-if test "x${install_complex_avx_block1}" = "xyes" ; then
+if test x"${install_complex_avx_block1}" = x"yes" ; then
 
 $as_echo "#define WITH_COMPLEX_AVX_BLOCK1_KERNEL 1" >>confdefs.h
 
@@ -7563,7 +7564,7 @@ else
   WITH_COMPLEX_AVX_BLOCK2_KERNEL_FALSE=
 fi
 
-if test "x${install_complex_avx_block2}" = "xyes" ; then
+if test x"${install_complex_avx_block2}" = x"yes" ; then
 
 $as_echo "#define WITH_COMPLEX_AVX_BLOCK2_KERNEL 1" >>confdefs.h
 
@@ -7577,7 +7578,7 @@ else
   WITH_REAL_BGP_KERNEL_FALSE=
 fi
 
-if test "x${install_real_bgp}" = "xyes" ; then
+if test x"${install_real_bgp}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_BGP_KERNEL 1" >>confdefs.h
 
@@ -7591,19 +7592,19 @@ else
   WITH_REAL_BGQ_KERNEL_FALSE=
 fi
 
-if test "x${install_real_bgq}" = "xyes" ; then
+if test x"${install_real_bgq}" = x"yes" ; then
 
 $as_echo "#define WITH_REAL_BGQ_KERNEL 1" >>confdefs.h
 
 fi
 
-if test "x${use_specific_complex_kernel}" = "xyes" ; then
+if test x"${use_specific_complex_kernel}" = x"yes" ; then
 
 $as_echo "#define WITH_SPECIFIC_COMPLEX_KERNEL 1" >>confdefs.h
 
 fi
 
-if test "x${use_specific_real_kernel}" = "xyes" ; then
+if test x"${use_specific_real_kernel}" = x"yes" ; then
 
 $as_echo "#define WITH_SPECIFIC_COMPLEX_KERNEL 1" >>confdefs.h
 
diff --git a/ELPA_2014.06/configure.ac b/ELPA_2014.06/configure.ac
index 2d633c64d58655f2d8783ad7581467f5d04b0052..33b0707b7153682a0e3e5b337a1a8176199e0960 100644
--- a/ELPA_2014.06/configure.ac
+++ b/ELPA_2014.06/configure.ac
@@ -10,7 +10,8 @@ AM_SILENT_RULES([yes])
 AC_SUBST([ELPA_LIB_VERSION], [2014.06.000])
 # this is the version of the API, should be changed in the major revision
 # if and only if the actual API changes
-AC_SUBST([ELPA_SO_VERSION], [0:0:0])
+# see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([ELPA_SO_VERSION], [1:0:0])
 
 AX_CHECK_GNU_MAKE()
 if test x$_cv_gnu_make_command = x ; then
@@ -18,7 +19,7 @@ if test x$_cv_gnu_make_command = x ; then
 fi
 
 AC_CHECK_PROG(CPP_FOUND,cpp,yes,no)
-if test "x${CPP_FOUND}" = xno; then
+if test x"${CPP_FOUND}" = xno; then
   AC_MSG_ERROR([no cpp found])
 fi
 
@@ -665,7 +666,7 @@ dnl check whether one can compile with avx - gcc intrinsics
   [can_compile_avx=no]
  )
 dnl first test failed: try again after updating  CFLAGS and CXXFLAGS with -mavx
- if test "x${can_compile_avx}" = "xno"; then
+ if test x"${can_compile_avx}" = x"no"; then
  CFLAGS="$CFLAGS -mavx"
  CXXFLAGS="$CXXFLAGS -mavx"
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([     
@@ -681,7 +682,7 @@ dnl first test failed: try again after updating  CFLAGS and CXXFLAGS with -mavx
  fi
 AC_MSG_RESULT([${can_compile_avx}])
 
-if test "x${can_compile_avx}" = "xyes"; then
+if test x"${can_compile_avx}" = x"yes"; then
   install_real_avx_block2=yes
   install_real_avx_block4=yes
   install_real_avx_block6=yes
@@ -700,7 +701,7 @@ AC_ARG_WITH([avx-optimization],
 	      [with_avx_optimization=yes],
 	      [with_avx_optimization=no])
 AC_MSG_RESULT([${with_avx_optimization}])
-if test "x${with_avx_optimization}" = xyes; then
+if test x"${with_avx_optimization}" = xyes; then
  CFLAGS="$CFLAGS -funsafe-loop-optimizations -funsafe-math-optimizations -ftree-vect-loop-version -ftree-vectorize"
  CXXFLAGS="$CXXFLAGS -funsafe-loop-optimizations -funsafe-math-optimizations -ftree-vect-loop-version -ftree-vectorize"
 fi
@@ -710,7 +711,7 @@ m4_include([m4/ax_prog_fc_mpi.m4])
 dnl check whether an mpi compiler is available;
 dnl if not abort since it is mandatory
 AX_PROG_FC_MPI([],[have_mpi=yes],[have_mpi=no
-		 if test "x${have_mpi}" = xno; then
+		 if test x"${have_mpi}" = xno; then
   		  AC_MSG_ERROR([no mpi found])
 		  fi])
 
@@ -725,13 +726,13 @@ AC_ARG_WITH([openmp],
 	      [with_openmp=yes],
 	      [with_openmp=no])
   AC_MSG_RESULT([${with_openmp}])
-  if test "x${enable_openmp}" = xyes; then
+  if test x"${enable_openmp}" = xyes; then
      with_openmp=yes
      AC_MSG_CHECKING(whether --enable-openmp is specified)
      AC_MSG_RESULT([${enable_openmp}])
   fi
   AM_CONDITIONAL([WITH_OPENMP],[test x"$with_openmp" = x"yes"])
-  if test "x${with_openmp}" = xyes; then
+  if test x"${with_openmp}" = xyes; then
 	AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
         AX_ELPA_OPENMP
   fi
@@ -793,7 +794,7 @@ if test x"$can_compile_with_mkl" = x"yes" ; then
 fi
 
 dnl if not mkl, check all the necessary individually
-if test "x${have_mkl}" = "xyes" ; then
+if test x"${have_mkl}" = x"yes" ; then
   WITH_MKL=1
 else
 
@@ -802,7 +803,7 @@ else
   AC_MSG_CHECKING([whether we can link a program with a blas lib])
   AC_MSG_RESULT([${have_blas}])
 
-  if test "x${have_blas}" = "xno" ; then
+  if test x"${have_blas}" = x"no" ; then
     AC_MSG_ERROR([could not link with blas: specify path]) 
   fi	
   dnl now lapack
@@ -810,7 +811,7 @@ else
   AC_MSG_CHECKING([whether we can link a program with a lapack lib])
   AC_MSG_RESULT([${have_lapack}])
 
-  if test "x${have_lapack}" = "xno" ; then
+  if test x"${have_lapack}" = x"no" ; then
     AC_MSG_ERROR([could not link with lapack: specify path]) 
   fi
 	
@@ -821,7 +822,7 @@ else
 
 
 
-  if test "x${have_blacs}" = "xno" ; then
+  if test x"${have_blacs}" = x"no" ; then
     AC_MSG_ERROR([could not link with blacs: specify path]) 
   fi
 	
@@ -830,7 +831,7 @@ else
   AC_MSG_CHECKING([whether we can link a program with a scalapack lib])
   AC_MSG_RESULT([${have_scalapack}])
 
-  if test "x${have_scalapack}" = "xno" ; then
+  if test x"${have_scalapack}" = x"no" ; then
     AC_MSG_ERROR([could not link with scalapack: specify path]) 
   fi
 
@@ -854,7 +855,7 @@ else
    )
    AC_MSG_RESULT([${can_link_with_blacs_scalapack}])
 
-   if test "x${can_link_with_blacs_scalapack}" = "xyes" ; then
+   if test x"${can_link_with_blacs_scalapack}" = x"yes" ; then
      WITH_BLACS=1
    else
    AC_MSG_ERROR([We can neither link with MKL or another Scalpack. Please specify BLACS_LDFLAGS and BLACS_FCFLAGS!])
@@ -904,7 +905,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
 )
 AC_MSG_RESULT([${can_compile_bgp}])
 
-if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${can_compile_bgp}" = x"yes" ; then
   install_real_bgp=yes
   install_complex_bgp=yes
 fi
@@ -925,14 +926,14 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
 )
 AC_MSG_RESULT([${can_compile_bgq}])
 
-if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${can_compile_bgq}" = x"yes" ; then
   install_real_bgq=yes
   install_complex_bgq=yes
 fi
 
 
 dnl environment variable setting of kernel
-if test "x${fortran_can_check_environment}" = "xyes" ; then
+if test x"${fortran_can_check_environment}" = x"yes" ; then
  AC_DEFINE([HAVE_ENVIRONMENT_CHECKING],[1],[Fortran can querry environment variables])
 fi
 
@@ -944,9 +945,9 @@ dnl generic kernel
 AC_ARG_WITH([real-generic-kernel],
  [AS_HELP_STRING([-with-real-generic-kernel],[only compile generic-kernel for real case])],[],[with_real_generic_kernel=no])
 
-if test "${with_real_generic_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-#  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_real_generic_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+#  if test x"${can_compile_sse}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=yes
@@ -972,8 +973,8 @@ dnl generic-simple kernel
 AC_ARG_WITH([real-generic-simple-kernel],
  [AS_HELP_STRING([-with-real-generic-simple-kernel],[only compile generic-simple-kernel for real case])],[],[with_real_generic_simple_kernel=no])
 
-if test "${with_real_generic_simple_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
+if test x"${with_real_generic_simple_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -997,9 +998,9 @@ dnl sse kernel
 AC_ARG_WITH([real-sse-kernel],
  [AS_HELP_STRING([-with-real-sse-kernel],[only compile sse-kernel for real case])],[],[with_real_sse_kernel=no])
 
-if test "${with_real_sse_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_real_sse_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_sse}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1025,9 +1026,9 @@ dnl bgp kernel
 AC_ARG_WITH([real-bgp-kernel],
  [AS_HELP_STRING([-with-real-bgp-kernel],[only compile bgp-kernel for real case])],[],[with_real_bgp_kernel=no])
 
-if test "${with_real_bgp_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${with_real_bgp_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_bgp}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1053,9 +1054,9 @@ dnl bgq kernel
 AC_ARG_WITH([real-bgq-kernel],
  [AS_HELP_STRING([-with-real-bgq-kernel],[only compile bgq-kernel for real case])],[],[with_real_bgq_kernel=no])
 
-if test "${with_real_bgq_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${with_real_bgq_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_bgq}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1081,9 +1082,9 @@ dnl real-avx-block2 kernel
 AC_ARG_WITH([real-avx-block2-kernel],
  [AS_HELP_STRING([-with-real-avx-block2-kernel],[only compile real-avx-block2-kernel for real case])],[],[with_real_avx_block2_kernel=no])
 
-if test "${with_real_avx_block2_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block2_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1109,9 +1110,9 @@ dnl real-avx-block4 kernel
 AC_ARG_WITH([real-avx-block4-kernel],
  [AS_HELP_STRING([-with-real-avx-block4-kernel],[only compile real-avx-block4-kernel for real case])],[],[with_real_avx_block4_kernel=no])
 
-if test "${with_real_avx_block4_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block4_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1137,9 +1138,9 @@ dnl real-avx-block6 kernel
 AC_ARG_WITH([real-avx-block6-kernel],
  [AS_HELP_STRING([-with-real-avx-block6-kernel],[only compile real-avx-block6-kernel for real case])],[],[with_real_avx_block6_kernel=no])
 
-if test "${with_real_avx_block6_kernel}" = "xyes" ; then
- if test "x${use_specific_real_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_real_avx_block6_kernel}" = x"yes" ; then
+ if test x"${use_specific_real_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_real_generic=no
@@ -1170,8 +1171,8 @@ dnl generic kernel
 AC_ARG_WITH([complex-generic-kernel],
  [AS_HELP_STRING([-with-complex-generic-kernel],[only compile generic-kernel for complex case])],[],[with_complex_generic_kernel=no])
 
-if test "${with_complex_generic_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
+if test x"${with_complex_generic_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=yes
@@ -1194,8 +1195,8 @@ dnl generic-simple kernel
 AC_ARG_WITH([complex-generic-simple-kernel],
  [AS_HELP_STRING([-with-complex-generic-simple-kernel],[only compile generic-simple-kernel for complex case])],[],[with_complex_generic_simple_kernel=no])
 
-if test "${with_complex_generic_simple_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
+if test x"${with_complex_generic_simple_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1219,9 +1220,9 @@ dnl sse kernel
 AC_ARG_WITH([complex-sse-kernel],
  [AS_HELP_STRING([-with-complex-sse-kernel],[only compile sse-kernel for complex case])],[],[with_complex_sse_kernel=no])
 
-if test "${with_complex_sse_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_sse}" = "xyes" ; then
+if test x"${with_complex_sse_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_sse}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1247,9 +1248,9 @@ dnl complex-bqp kernel
 AC_ARG_WITH([complex-bgp-kernel],
  [AS_HELP_STRING([-with-complex-bgp-kernel],[only compile BGP-kernel (identical with complex-generic kernel) for complex case])],[],[with_complex_bgp_kernel=no])
 
-if test "${with_complex_bgp_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_bgp}" = "xyes" ; then
+if test x"${with_complex_bgp_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_bgp}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1276,9 +1277,9 @@ dnl complex-bqq kernel
 AC_ARG_WITH([complex-bgq-kernel],
  [AS_HELP_STRING([-with-complex-bgq-kernel],[only compile BGQ-kernel (identical with complex-generic kernel) for complex case])],[],[with_complex_bgq_kernel=no])
 
-if test "${with_complex_bgq_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_bgq}" = "xyes" ; then
+if test x"${with_complex_bgq_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_bgq}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1304,9 +1305,9 @@ dnl complex-avx-block1 kernel
 AC_ARG_WITH([complex-avx-block1-kernel],
  [AS_HELP_STRING([-with-complex-avx-block1-kernel],[only compile complex-avx-block1-kernel for complex case])],[],[with_complex_avx_block1_kernel=no])
 
-if test "${with_complex_avx_block1_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_complex_avx_block1_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1330,9 +1331,9 @@ dnl complex-avx-block2 kernel
 AC_ARG_WITH([complex-avx-block2-kernel],
  [AS_HELP_STRING([-with-complex-avx-block2-kernel],[only compile complex-avx-block2-kernel for complex case])],[],[with_complex_avx_block2_kernel=no])
 
-if test "${with_complex_avx_block2_kernel}" = "xyes" ; then
- if test "x${use_specific_complex_kernel}" = "xno" ; then
-  if test "x${can_compile_avx}" = "xyes" ; then
+if test x"${with_complex_avx_block2_kernel}" = x"yes" ; then
+ if test x"${use_specific_complex_kernel}" = x"no" ; then
+  if test x"${can_compile_avx}" = x"yes" ; then
 
     dnl make sure that all the other kernels are unset
     install_complex_generic=no
@@ -1354,81 +1355,81 @@ fi
 
 
 dnl set the conditionals according to the previous tests
-if test "x${can_use_iso_fortran_env}" = "xyes" ; then
+if test x"${can_use_iso_fortran_env}" = x"yes" ; then
  AC_DEFINE([HAVE_ISO_FORTRAN_ENV],[1],[can use module iso_fortran_env])
 fi
 
 
 AM_CONDITIONAL([WITH_REAL_GENERIC_KERNEL],[test x"$install_real_generic" = x"yes"])
-if test "x${install_real_generic}" = "xyes" ; then
+if test x"${install_real_generic}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_GENERIC_KERNEL],[1],[can use real generic kernel])
 fi
 
 AM_CONDITIONAL([WITH_COMPLEX_GENERIC_KERNEL],[test x"$install_complex_generic" = x"yes"])
-if test "x${install_complex_generic}" = "xyes" ; then
+if test x"${install_complex_generic}" = x"yes" ; then
  AC_DEFINE([WITH_COMPLEX_GENERIC_KERNEL],[1],[can use complex generic kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_GENERIC_SIMPLE_KERNEL],[test x"$install_real_generic_simple" = x"yes"])
-if test "x${install_real_generic_simple}" = "xyes" ; then
+if test x"${install_real_generic_simple}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_GENERIC_SIMPLE_KERNEL],[1],[can use real generic-simple kernel])
 fi
 
 AM_CONDITIONAL([WITH_COMPLEX_GENERIC_SIMPLE_KERNEL],[test x"$install_complex_generic_simple" = x"yes"])
-if test "x${install_complex_generic_simple}" = "xyes" ; then
+if test x"${install_complex_generic_simple}" = x"yes" ; then
  AC_DEFINE([WITH_COMPLEX_GENERIC_SIMPLE_KERNEL],[1],[can use complex generic-simple kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_SSE_KERNEL],[test x"$install_real_sse" = x"yes"])
-if test "x${install_real_sse}" = "xyes" ; then
+if test x"${install_real_sse}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_SSE_KERNEL],[1],[can use real SSE kernel])
 fi
 
 AM_CONDITIONAL([WITH_COMPLEX_SSE_KERNEL],[test x"$install_complex_sse" = x"yes"])
-if test "x${install_complex_sse}" = "xyes" ; then
+if test x"${install_complex_sse}" = x"yes" ; then
  AC_DEFINE([WITH_COMPLEX_SSE_KERNEL],[1],[can use complex SSE kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_AVX_BLOCK2_KERNEL],[test x"$install_real_avx_block2" = x"yes"])
-if test "x${install_real_avx_block2}" = "xyes" ; then
+if test x"${install_real_avx_block2}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_AVX_BLOCK2_KERNEL],[1],[can use real_avx_block2 kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_AVX_BLOCK4_KERNEL],[test x"$install_real_avx_block4" = x"yes"])
-if test "x${install_real_avx_block4}" = "xyes" ; then
+if test x"${install_real_avx_block4}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_AVX_BLOCK4_KERNEL],[1],[can use real_avx_block4 kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_AVX_BLOCK6_KERNEL],[test x"$install_real_avx_block6" = x"yes"])
-if test "x${install_real_avx_block6}" = "xyes" ; then
+if test x"${install_real_avx_block6}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_AVX_BLOCK6_KERNEL],[1],[can use real_avx_block6 kernel])
 fi
 
 AM_CONDITIONAL([WITH_COMPLEX_AVX_BLOCK1_KERNEL],[test x"$install_complex_avx_block1" = x"yes"])
-if test "x${install_complex_avx_block1}" = "xyes" ; then
+if test x"${install_complex_avx_block1}" = x"yes" ; then
  AC_DEFINE([WITH_COMPLEX_AVX_BLOCK1_KERNEL],[1],[can use complex_avx_block1 kernel])
 fi
 
 AM_CONDITIONAL([WITH_COMPLEX_AVX_BLOCK2_KERNEL],[test x"$install_complex_avx_block2" = x"yes"])
-if test "x${install_complex_avx_block2}" = "xyes" ; then
+if test x"${install_complex_avx_block2}" = x"yes" ; then
  AC_DEFINE([WITH_COMPLEX_AVX_BLOCK2_KERNEL],[1],[can use complex_avx_block2 kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_BGP_KERNEL],[test x"$install_real_bgp" = x"yes"])
-if test "x${install_real_bgp}" = "xyes" ; then
+if test x"${install_real_bgp}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_BGP_KERNEL],[1],[can use real BGP kernel])
 fi
 
 AM_CONDITIONAL([WITH_REAL_BGQ_KERNEL],[test x"$install_real_bgq" = x"yes"])
-if test "x${install_real_bgq}" = "xyes" ; then
+if test x"${install_real_bgq}" = x"yes" ; then
  AC_DEFINE([WITH_REAL_BGQ_KERNEL],[1],[can use real BGQ kernel])
 fi
 
-if test "x${use_specific_complex_kernel}" = "xyes" ; then
+if test x"${use_specific_complex_kernel}" = x"yes" ; then
  AC_DEFINE([WITH_SPECIFIC_COMPLEX_KERNEL],[1],[use specific complex kernel])
 fi
 
-if test "x${use_specific_real_kernel}" = "xyes" ; then
+if test x"${use_specific_real_kernel}" = x"yes" ; then
  AC_DEFINE([WITH_SPECIFIC_COMPLEX_KERNEL],[1],[use specific real kernel])
 fi
 
diff --git a/ELPA_2014.06/src/elpa2.F90 b/ELPA_2014.06/src/elpa2.F90
index ba6b0bb6565fa1351082d31c3f7b74d125b5b965..11cc1889e84f1b108be6651fb47dcb130e4b0f58 100644
--- a/ELPA_2014.06/src/elpa2.F90
+++ b/ELPA_2014.06/src/elpa2.F90
@@ -5094,10 +5094,10 @@ contains
               w(:,1) = bcast_buffer(1:nbw,j+off)
               w(:,2) = bcast_buffer(1:nbw,j+off-1)
 #ifdef WITH_OPENMP
-              call double_hh_trafo_complex_sse_avx_2hv(a(1,j+off+a_off-1,istripe), &
+              call double_hh_trafo_complex_sse_avx_2hv(a(1,j+off+a_off-1,istripe,my_thread), &
                                                        w, nbw, nl, stripe_width, nbw)
 #else
-              call double_hh_trafo_complex_sse_avx_2hv(a(1,j+off+a_off-1,istripe,my_thread), &
+              call double_hh_trafo_complex_sse_avx_2hv(a(1,j+off+a_off-1,istripe), &
                                                        w, nbw, nl, stripe_width, nbw)
 #endif
            enddo