  /AUTHORS -text
  /AUTHORS.txt -text
  /CMakeLists.txt -text
-diff --git a/AUTHORS b/AUTHORS
-index 925e8e7..e9ad01c 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -62,6 +62,7 @@ bugs or proposing algorithmic improvements (in alphabetical order):
-     Boris Houska
-     D. Kwame Minde Kufoalor
-     Aude Perrin
-+    Silvio Traversaro
-     Milan Vukov
-     Thomas Wiese
-     Leonard Wirsching
-diff --git a/AUTHORS.txt b/AUTHORS.txt
-index 3f44c0c..012529d 100644
---- a/AUTHORS.txt
-+++ b/AUTHORS.txt
-@@ -62,6 +62,7 @@ bugs or proposing algorithmic improvements (in alphabetical order):
-     Boris Houska
-     D. Kwame Minde Kufoalor
-     Aude Perrin
-+    Silvio Traversaro
-     Milan Vukov
-     Thomas Wiese
-     Leonard Wirsching
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index adb111f..9ef6de7 100644
 --- a/CMakeLists.txt

 
 
 BEGIN_NAMESPACE_QPOASES
diff --git a/interfaces/c/Makefile b/interfaces/c/Makefile
index 1f4d188..f7774a1 100644
--- a/interfaces/c/Makefile
+++ b/interfaces/c/Makefile
@@ -57,6 +57,7 @@ QPOASES_WRAPPER_OBJECTS = \
 
 QPOASES_DEPENDS = \
 	${IDIR}/qpOASES.hpp \
+	${IDIR}/qpOASES/LapackBlasReplacement.hpp \
 	${IDIR}/qpOASES/SQProblem.hpp \
 	${IDIR}/qpOASES/QProblem.hpp \
 	${IDIR}/qpOASES/Flipper.hpp \
diff --git a/interfaces/matlab/make.m b/interfaces/matlab/make.m
index 0ff4274..37c02c2 100644
--- a/interfaces/matlab/make.m
+++ b/interfaces/matlab/make.m
@@ -65,7 +65,7 @@ function [] = make( varargin )
     %DEBUGFLAGS = ' -v -g CXXDEBUGFLAGS=''$CXXDEBUGFLAGS -Wall -pedantic -Wshadow'' ';
 
     IFLAGS = [ '-I. -I',QPOASESPATH,'include',' -I',QPOASESPATH,'src',' ' ];
-    CPPFLAGS = [ IFLAGS, DEBUGFLAGS, '-largeArrayDims -D__cpluplus -D__MATLAB__ -D__SINGLE_OBJECT__',' ' ];
+    CPPFLAGS = [ IFLAGS, DEBUGFLAGS, '-largeArrayDims -D__cpluplus -D__MATLAB__ -D__AVOID_LA_NAMING_CONFLICTS__ -D__SINGLE_OBJECT__',' ' ];
     defaultFlags = '-O -D__NO_COPYRIGHT__ '; %% -D__SUPPRESSANYOUTPUT__
 
     if ( ispc() == 0 )
diff --git a/interfaces/python/README.rst b/interfaces/python/README.rst
index 64911d9..2b17d11 100644
--- a/interfaces/python/README.rst

 INSTALL(TARGETS qpOASES
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
diff --git a/include/qpOASES/LapackBlasReplacement.hpp b/include/qpOASES/LapackBlasReplacement.hpp
index 529c3eb..2c34c58 100644
--- a/include/qpOASES/LapackBlasReplacement.hpp
