diff --git a/launch/LMS1xx.launch b/launch/LMS1xx.launch
index 105075a..ea81081 100644
--- a/launch/LMS1xx.launch
+++ b/launch/LMS1xx.launch
@@ -1,6 +1,8 @@
 <launch>
   <arg name="host" default="192.168.1.14" />
+  <arg name="publish_min_range_as_inf" default="false" />
   <node pkg="lms1xx" name="lms1xx" type="LMS1xx_node">
     <param name="host" value="$(arg host)" />
+    <param name="publish_min_range_as_inf" value="$(arg publish_min_range_as_inf)" />
   </node>
 </launch>
diff --git a/src/LMS1xx_node.cpp b/src/LMS1xx_node.cpp
index e7ed2f7..03fbf28 100644
--- a/src/LMS1xx_node.cpp
+++ b/src/LMS1xx_node.cpp
@@ -26,6 +26,8 @@
 #include <LMS1xx/LMS1xx.h>
 #include "ros/ros.h"
 #include "sensor_msgs/LaserScan.h"
+#include <limits>
+#include <string>
 
 #define DEG2RAD M_PI/180.0
 
@@ -41,6 +43,7 @@ int main(int argc, char **argv)
   // parameters
   std::string host;
   std::string frame_id;
+  bool inf_range;
   int port;
 
   ros::init(argc, argv, "lms1xx");
@@ -50,6 +53,7 @@ int main(int argc, char **argv)
 
   n.param<std::string>("host", host, "192.168.1.2");
   n.param<std::string>("frame_id", frame_id, "laser");
+  n.param<bool>("publish_min_range_as_inf", inf_range, false);
   n.param<int>("port", port, 2111);
 
   while (ros::ok())
@@ -87,15 +91,15 @@ int main(int argc, char **argv)
     scan_msg.range_min = 0.01;
     scan_msg.range_max = 20.0;
     scan_msg.scan_time = 100.0 / cfg.scaningFrequency;
-    scan_msg.angle_increment = (double)outputRange.angleResolution / 10000.0 * DEG2RAD;
-    scan_msg.angle_min = (double)outputRange.startAngle / 10000.0 * DEG2RAD - M_PI / 2;
-    scan_msg.angle_max = (double)outputRange.stopAngle / 10000.0 * DEG2RAD - M_PI / 2;
+    scan_msg.angle_increment = static_cast<double>(outputRange.angleResolution / 10000.0 * DEG2RAD);
+    scan_msg.angle_min = static_cast<double>(outputRange.startAngle / 10000.0 * DEG2RAD - M_PI / 2);
+    scan_msg.angle_max = static_cast<double>(outputRange.stopAngle / 10000.0 * DEG2RAD - M_PI / 2);
 
     ROS_DEBUG_STREAM("Device resolution is " << (double)outputRange.angleResolution / 10000.0 << " degrees.");
     ROS_DEBUG_STREAM("Device frequency is " << (double)cfg.scaningFrequency / 100.0 << " Hz");
 
     int angle_range = outputRange.stopAngle - outputRange.startAngle;
-    int num_values = angle_range / outputRange.angleResolution ;
+    int num_values = angle_range / outputRange.angleResolution;
     if (angle_range % outputRange.angleResolution == 0)
     {
       // Include endpoint
@@ -128,8 +132,8 @@ int main(int argc, char **argv)
     ROS_DEBUG("Waiting for ready status.");
     ros::Time ready_status_timeout = ros::Time::now() + ros::Duration(5);
 
-    //while(1)
-    //{
+    // while(1)
+    // {
     status_t stat = laser.queryStatus();
     ros::Duration(1.0).sleep();
     if (stat != ready_for_measurement)
@@ -160,7 +164,7 @@ int main(int argc, char **argv)
     }*/
 
     ROS_DEBUG("Starting device.");
-    laser.startDevice(); // Log out to properly re-enable system after config
+    laser.startDevice();  // Log out to properly re-enable system after config
 
     ROS_DEBUG("Commanding continuous measurements.");
     laser.scanContinous(1);
@@ -178,7 +182,16 @@ int main(int argc, char **argv)
       {
         for (int i = 0; i < data.dist_len1; i++)
         {
-          scan_msg.ranges[i] = data.dist1[i] * 0.001;
+          float range_data = data.dist1[i] * 0.001;
+
+          if (inf_range && range_data < scan_msg.range_min)
+          {
+            scan_msg.ranges[i] = std::numeric_limits<float>::infinity();
+          }
+          else
+          {
+            scan_msg.ranges[i] = range_data;
+          }
         }
 
         for (int i = 0; i < data.rssi_len1; i++)