diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7fb9e384..fe32c79b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,8 +519,8 @@ if(NOT ARMADILLO_FOUND)
      message (STATUS " Armadillo has not been found.")
      message (STATUS " Armadillo will be downloaded and built automatically ")
      message (STATUS " when doing 'make'. ")
-     set(armadillo_RELEASE 3.920.2)
-     set(armadillo_MD5 "3d0396513e2802c08152f50e18b4a1cd")
+     set(armadillo_RELEASE 3.930.2)
+     set(armadillo_MD5 "eef486a0fdde9a23b1067e9c57f146e4")
      if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE}/armadillo-${armadillo_RELEASE}.tar.gz)
           set(ARMADILLO_PATCH_FILE ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/armadillo_no.patch)
           file(WRITE ${ARMADILLO_PATCH_FILE} "")
@@ -531,10 +531,10 @@ if(NOT ARMADILLO_FOUND)
 < set(ARMA_USE_WRAPPER true )
 ---
 > set(ARMA_USE_WRAPPER false)
-323c323
-< add_library( armadillo SHARED src/wrap_libs )
+343c343
+< add_library( armadillo SHARED src/wrapper )
 ---
-> add_library( armadillo STATIC src/wrap_libs )
+> add_library( armadillo STATIC src/wrapper )
 ")                     
      endif(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE}/armadillo-${armadillo_RELEASE}.tar.gz)
      ExternalProject_Add(
@@ -546,7 +546,7 @@ if(NOT ARMADILLO_FOUND)
           PATCH_COMMAND patch -N <BINARY_DIR>/CMakeLists.txt ${ARMADILLO_PATCH_FILE}  
           BUILD_IN_SOURCE 1
           BUILD_COMMAND make
-          UPDATE_COMMAND ""
+          UPDATE_COMMAND "" 
           INSTALL_COMMAND ""
      )
      # Set up variables
@@ -626,16 +626,15 @@ endif($ENV{RTLSDR_DRIVER} )
 # Enable C++11 support in GCC
 # For "-std=c++0x"  GCC's support for C++11 see http://gcc.gnu.org/projects/cxx0x.html
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++0x")
+     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++0x -Wall")  #Add warning flags: For "-Wall" see http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wno-c++11-narrowing") 
+    if(CMAKE_BUILD_TYPE MATCHES "Release")
+        set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wno-unused-private-field") 
+    endif(CMAKE_BUILD_TYPE MATCHES "Release")
 endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
-# Add warning flags 
-# For "-Wall" see http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
-set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall")
-
 # Processor-architecture related flags
 # See http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html#i386-and-x86_002d64-Options
 # Change to '-mtune=generic' when building for distribution
diff --git a/README b/README
index 9cd952a60..c2ff0d4c0 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ This document describes how to set up the compilation environment and build GNSS
 
 GNU/Linux 
 -----------------------------------------------------------
-Tested distributions: Ubuntu 12.04, 12.10, 13.04 and 13.10 (32 and 64 bits), Debian 6.0.6 and 7.2, Fedora 18 (newer versions should work, too)
+Tested distributions: Ubuntu 12.04, 12.10, 13.04 and 13.10 (32 and 64 bits), Debian 6.0.6 and 7.2, Fedora 18, 10 and 20 (newer versions should work, too)
 
 * Install GNU Radio:
 
@@ -44,9 +44,9 @@ In case you do not want to use PyBOMBS and prefer to build and install GNU Radio
 $ sudo apt-get install libblas-dev liblapack-dev gfortran   # For Debian/Ubuntu/LinuxMint
 $ sudo yum install lapack-devel blas-devel gcc-fortran      # For Fedora/CentOS/RHEL
 
-$ wget http://sourceforge.net/projects/arma/files/armadillo-3.920.2.tar.gz
-$ tar xvfz armadillo-3.920.2.tar.gz
-$ cd armadillo-3.920.2
+$ wget http://sourceforge.net/projects/arma/files/armadillo-3.930.2.tar.gz
+$ tar xvfz armadillo-3.930.2.tar.gz
+$ cd armadillo-3.930.2
 $ cmake .
 $ make
 $ sudo make install
@@ -67,7 +67,7 @@ $ sudo ldconfig
 
 $ wget http://google-glog.googlecode.com/files/glog-0.3.3.tar.gz 
 $ tar xvfz glog-0.3.3.tar.gz 
-$ cd glog-0.3.2
+$ cd glog-0.3.3
 $ ./configure
 $ make
 $ sudo make install
diff --git a/src/algorithms/output_filter/adapters/CMakeLists.txt b/src/algorithms/output_filter/adapters/CMakeLists.txt
index 7f1aaa2d5..b119efb3e 100644
--- a/src/algorithms/output_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/output_filter/adapters/CMakeLists.txt
@@ -31,5 +31,5 @@ include_directories(
 )
 
 add_library(out_adapters ${OUTPUTFILTER_ADAPTER_SOURCES})
+add_dependencies(out_adapters glog-${glog_RELEASE})
 target_link_libraries(out_adapters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
-add_dependencies(out_adapters glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index 36e6d3502..1eb842123 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -29,9 +29,14 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 	${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
 	)
-	
-	
+
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    if(CMAKE_BUILD_TYPE MATCHES "Release")
+        set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality")         
+    endif(CMAKE_BUILD_TYPE MATCHES "Release")
+endif(CMAKE_C_COMPILER_ID MATCHES "Clang")	
+list(APPEND CMAKE_C_FLAGS ${MY_C_FLAGS})	
 
 add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 target_link_libraries (supl_library ssl gnss_system_parameters) 
-SET_TARGET_PROPERTIES(supl_library PROPERTIES LINKER_LANGUAGE C)
\ No newline at end of file
+set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)
\ No newline at end of file