diff --git a/.gitignore b/.gitignore
index a128f1558..96a025531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ thirdparty/
 cmake-build-debug/
 /install
 .DS_Store
+.pydevproject
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e26aa7688..f9a035feb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,6 +87,7 @@ add_feature_info(ENABLE_FPGA ENABLE_FPGA "Enables building of processing blocks
 
 # Building and packaging options
 option(ENABLE_GENERIC_ARCH "Builds a portable binary" OFF)
+add_feature_info(ENABLE_GENERIC_ARCH ENABLE_GENERIC_ARCH "When disabled, flags such as '-march=native' are passed to the compiler.")
 
 option(ENABLE_PACKAGING "Enable software packaging" OFF)
 add_feature_info(ENABLE_PACKAGING ENABLE_PACKAGING "Enables software packaging.")
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 69dd5c022..37f5de8fe 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -64,9 +64,9 @@ check_cxx_source_compiles("
     #include <iomanip>
     int main()
     { std::put_time(nullptr, \"\"); }"
-    HAS_PUT_TIME
+    has_put_time
 )
-if(${HAS_PUT_TIME})
+if(${has_put_time})
     target_compile_definitions(pvt_gr_blocks PRIVATE -DHAS_PUT_TIME=1)
 endif()
 
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index f4305a75a..1b8cd9cbe 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -193,12 +193,7 @@ const int NSATGLO = 0;
 const int NSYSGLO = 0;
 #endif
 
-/*
-const int MINPRNGLO = 1;                   //!<   min satellite slot number of GLONASS
-const int MAXPRNGLO = 27;                  //!<   max satellite slot number of GLONASS
-const int NSATGLO = (MAXPRNGLO - MINPRNGLO + 1); //!<   number of GLONASS satellites
-const int NSYSGLO = 1;
-*/
+
 const int MINPRNGAL = 1;                          //!<   min satellite PRN number of Galileo
 const int MAXPRNGAL = 36;                         //!<   max satellite PRN number of Galileo
 const int NSATGAL = (MAXPRNGAL - MINPRNGAL + 1);  //!<   number of Galileo satellites
diff --git a/src/algorithms/libs/rtklib/rtklib_ionex.cc b/src/algorithms/libs/rtklib/rtklib_ionex.cc
index 8ba2bb950..8b8d39ade 100644
--- a/src/algorithms/libs/rtklib/rtklib_ionex.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ionex.cc
@@ -1,5 +1,5 @@
 /*!
- * \file rtklib_ionex.h
+ * \file rtklib_ionex.cc
  * \brief ionex functions
  * \authors <ul>
  *          <li> 2007-2013, T. Takasu
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
index 8fbde5a88..8f98bfeb0 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
@@ -79,7 +79,7 @@
 #define GNSS_SDR_RTKLIB_RTKCMN_H_
 
 #include "rtklib.h"
-//#include <glog/logging.h>
+
 
 /* coordinate rotation matrix ------------------------------------------------*/
 #define Rx(t, X)                                     \
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
index 8b2e00833..2943c8be2 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
@@ -1,3 +1,55 @@
+/*!
+ * \file rtklib_rtksvr.cc
+ * \brief rtk server functions
+ * \authors <ul>
+ *          <li> 2007-2013, T. Takasu
+ *          <li> 2017, Javier Arribas
+ *          <li> 2017, Carles Fernandez
+ *          </ul>
+ *
+ * This is a derived work from RTKLIB http://www.rtklib.com/
+ * The original source code at https://github.com/tomojitakasu/RTKLIB is
+ * released under the BSD 2-clause license with an additional exclusive clause
+ * that does not apply here. This additional clause is reproduced below:
+ *
+ * " The software package includes some companion executive binaries or shared
+ * libraries necessary to execute APs on Windows. These licenses succeed to the
+ * original ones of these software. "
+ *
+ * Neither the executive binaries nor the shared libraries are required by, used
+ * or included in GNSS-SDR.
+ *
+ * -------------------------------------------------------------------------
+ * Copyright (C) 2007-2013, T. Takasu
+ * Copyright (C) 2017, Javier Arribas
+ * Copyright (C) 2017, Carles Fernandez
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *----------------------------------------------------------------------------*/
 
 #include "rtklib_rtksvr.h"
 #include "rtklib_preceph.h"
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
index 11f5e512e..9bedf6167 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
@@ -29,8 +29,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSWIFTNAV_BITS_H
-#define LIBSWIFTNAV_BITS_H
+#ifndef GNSS_SDR_BITS_H_
+#define GNSS_SDR_BITS_H_
 
 #include "swift_common.h"
 
@@ -47,4 +47,4 @@ uint8_t count_bits_u32(uint32_t v, uint8_t bv);
 uint8_t count_bits_u16(uint16_t v, uint8_t bv);
 uint8_t count_bits_u8(uint8_t v, uint8_t bv);
 
-#endif /* LIBSWIFTNAV_BITS_H */
+#endif /* GNSS_SDR_BITS_H_ */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index 9e4bdd65f..39d412230 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef LIBSWIFTNAV_CNAV_MSG_H
-#define LIBSWIFTNAV_CNAV_MSG_H
+#ifndef GNSS_SDR_CNAV_MSG_H_
+#define GNSS_SDR_CNAV_MSG_H_
 
 #include "fec.h"
 #include "swift_common.h"
@@ -117,4 +117,4 @@ bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
 /** \} */
 /** \} */
 
-#endif /* LIBSWIFTNAV_CNAV_MSG_H */
+#endif /* GNSS_SDR_CNAV_MSG_H_ */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
index 03a4022a7..55e27fa1e 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
@@ -30,12 +30,12 @@
  */
 
 
-#ifndef LIBSWIFTNAV_EDC_H
-#define LIBSWIFTNAV_EDC_H
+#ifndef GNSS_SDR_EDC_H_
+#define GNSS_SDR_EDC_H_
 
 #include "swift_common.h"
 
 uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc);
 uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert);
 
-#endif /* LIBSWIFTNAV_EDC_H */
+#endif /* GNSS_SDR_EDC_H_ */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h
index f00e88e68..8a594ecc9 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/fec.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef LIBSWIFTNAV_FEC_H_
-#define LIBSWIFTNAV_FEC_H_
+#ifndef GNSS_SDR_FEC_H_
+#define GNSS_SDR_FEC_H_
 
 /* r=1/2 k=7 convolutional encoder polynomials
  * The NASA-DSN convention is to use V27POLYA inverted, then V27POLYB
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
index 3b83f3034..f98fa538f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
@@ -32,8 +32,8 @@
  */
 
 
-#ifndef LIBSWIFTNAV_COMMON_H
-#define LIBSWIFTNAV_COMMON_H
+#ifndef GNSS_SDR_SWIFT_COMMON_H_
+#define GNSS_SDR_SWIFT_COMMON_H_
 
 /** \defgroup common Common definitions
  * Common definitions used throughout the library.
@@ -50,4 +50,4 @@
 
 /** \} */
 
-#endif /* LIBSWIFTNAV_COMMON_H */
+#endif /* GNSS_SDR_SWIFT_COMMON_H_ */
diff --git a/src/core/system_parameters/Beidou_B1I.h b/src/core/system_parameters/Beidou_B1I.h
index bf2066ce7..312a9a0a2 100644
--- a/src/core/system_parameters/Beidou_B1I.h
+++ b/src/core/system_parameters/Beidou_B1I.h
@@ -5,7 +5,7 @@
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 40cabe10a..6ff21b7d3 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -7,7 +7,7 @@
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index f2ca11e39..64bac3506 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -6,7 +6,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver