  INSTALL(TARGETS qpOASES
    LIBRARY DESTINATION lib
    ARCHIVE DESTINATION lib
-diff --git a/Makefile b/Makefile
-index 9d83ab8..2a87c1a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@
- ##
- ##	qpOASES is distributed in the hope that it will be useful,
- ##	but WITHOUT ANY WARRANTY; without even the implied warranty of
--##	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-+##	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- ##	See the GNU Lesser General Public License for more details.
- ##
- ##	You should have received a copy of the GNU Lesser General Public
-@@ -40,16 +40,16 @@ all: src examples
- #src_aw testing
- 
- src:
--	@cd $@; ${MAKE} -s 
-+	@cd $@; ${MAKE} -s
- 
- #src_aw:
--#	@cd $@; ${MAKE} -s 
-+#	@cd $@; ${MAKE} -s
- 
- examples: src
- 	@cd $@; ${MAKE} -s
- 
- doc:
--	@cd $@; ${MAKE} -s 
-+	@cd $@; ${MAKE} -s
- 
- testing: src
- 	@cd testing/cpp; ${MAKE} -s
-@@ -58,7 +58,7 @@ test: testing
- 	@cd testing/cpp; ${MAKE} -s runTests
- 
- debugging:
--	@cd $@; ${MAKE} -s 
-+	@cd $@; ${MAKE} -s
- 
- clean:
- 	@cd src               && ${MAKE} -s clean
-diff --git a/README b/README
-index ab62901..cafbbc2 100644
---- a/README
-+++ b/README
-@@ -52,7 +52,7 @@ GETTING STARTED
- 3. The whole software package can be obtained from 
- 
-        http://www.qpOASES.org/ or
--	   https://projects.coin-or.org/qpOASES/
-+       https://github.com/coin-or/qpOASES/
- 
-    On this webpage you will also find further support such as a list of 
-    questions posed by other users.
 diff --git a/include/qpOASES/LapackBlasReplacement.hpp b/include/qpOASES/LapackBlasReplacement.hpp
 index 529c3eb..2c34c58 100644
 --- a/include/qpOASES/LapackBlasReplacement.hpp

 
 
 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

 /AUTHORS -text
 /AUTHORS.txt -text
 /CMakeLists.txt -text
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adb111f..9ef6de7 100644
--- a/CMakeLists.txt
