diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc
--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc	2010-06-30 23:19:02.000000000 +0200
+++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc	2016-03-18 14:21:44.602788348 +0100
@@ -4757,4 +4757,6 @@
     
   }
 
+  const double SickLD::SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125;                       ///< Minimum valid separation between laser pulses in active 
+  const double SickLD::SICK_DEGREES_PER_MOTOR_STEP = 0.0625;                           ///< Each odometer tick is equivalent to rotating the scan he
 } //namespace SickToolbox
diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh
--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh	2010-06-30 23:19:02.000000000 +0200
+++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh	2016-03-18 14:17:22.270901575 +0100
@@ -69,8 +69,8 @@
     static const uint16_t SICK_MAX_MEAN_PULSE_FREQUENCY = 10800;                        ///< Max mean pulse frequence of the current device configuration (in Hz) (see page 22 of the operator's manual)
     static const uint16_t SICK_MAX_PULSE_FREQUENCY = 14400;                             ///< Max pulse frequency of the device (in Hz) (see page 22 of the operator's manual)
     static const uint16_t SICK_NUM_TICKS_PER_MOTOR_REV = 5760;                          ///< Odometer ticks per revolution of the Sick LD scan head
-    static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125;                       ///< Minimum valid separation between laser pulses in active scan ares (deg)
-    static const double SICK_DEGREES_PER_MOTOR_STEP = 0.0625;                           ///< Each odometer tick is equivalent to rotating the scan head this many degrees
+    static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION /* = 0.125 */;                       ///< Minimum valid separation between laser pulses in active scan ares (deg)
+    static const double SICK_DEGREES_PER_MOTOR_STEP /* = 0.0625 */;                           ///< Each odometer tick is equivalent to rotating the scan head this many degrees
     
     /* Sick LD sensor modes of operation */
     static const uint8_t SICK_SENSOR_MODE_IDLE = 0x01;                                  ///< The Sick LD is powered but idle
diff -Naur sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc
--- sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc	2010-06-30 23:25:02.000000000 +0200
+++ sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc	2016-03-18 14:25:45.336849106 +0100
@@ -260,7 +260,7 @@
   config_path = getFilename();
 
   /* Instantiate the parser */
-  if(ifstream(config_path.c_str()) != NULL) {
+  if(ifstream(config_path.c_str())) {
     sick_config_file = ConfigFile(config_path);
   }
   else {