diff --git a/freecad/gears/features.py b/freecad/gears/features.py
index 8be8f00..fbbfee5 100644
--- a/freecad/gears/features.py
+++ b/freecad/gears/features.py
@@ -208,6 +208,8 @@ class InvoluteGearRack(object):
             gear parameters are internally recomputed for the rotated gear")
         obj.addProperty("App::PropertyLength", "transverse_pitch",
             "computed", "pitch in the transverse plane", 1)
+        obj.addProperty("App::PropertyBool", "add_endings", "gear_parameter", "if enabled the total length of the rack is teeth x pitch, \
+            otherwise the rack starts with a tooth-flank")
         obj.addProperty("App::PropertyPythonObject", "rack", "test", "test")
         obj.rack = self.involute_rack
         obj.teeth = 15
@@ -219,6 +221,7 @@ class InvoluteGearRack(object):
         obj.clearence = 0.25
         obj.head = 0.
         obj.properties_from_tool = True
+        obj.add_endings = True
         self.obj = obj
         obj.Proxy = self
 
@@ -234,6 +237,8 @@ class InvoluteGearRack(object):
             fp.rack.clearence = fp.clearence
         if "properties_from_tool" in fp.PropertiesList:
             fp.rack.properties_from_tool = fp.properties_from_tool
+        if "add_endings" in fp.PropertiesList:
+            fp.rack.add_endings = fp.add_endings
         fp.rack._update()
         pts = fp.rack.points()
         pol = Wire(makePolygon(list(map(fcvec, pts))))
diff --git a/pygears/involute_tooth.py b/pygears/involute_tooth.py
index b72e531..fa188e6 100644
--- a/pygears/involute_tooth.py
+++ b/pygears/involute_tooth.py
@@ -161,7 +161,8 @@ class InvoluteTooth():
 
 
 class InvoluteRack(object):
-    def __init__(self, m=5, z=15, pressure_angle=20 * pi / 180., thickness=5, beta=0, head=0, clearence = 0.25, properties_from_tool=False):
+    def __init__(self, m=5, z=15, pressure_angle=20 * pi / 180., thickness=5, beta=0, head=0, clearence=0.25, 
+                 properties_from_tool=False, add_endings=False):
         self.pressure_angle = pressure_angle
         self.thickness = thickness
         self.m = m
@@ -170,11 +171,12 @@ class InvoluteRack(object):
         self.head = head
         self.clearence = clearence
         self.properties_from_tool = properties_from_tool
+        self.add_endings = add_endings
 
     def _update(self):
         self.__init__(m=self.m, z=self.z, pressure_angle=self.pressure_angle,
                       thickness=self.thickness, beta=self.beta, head=self.head, clearence=self.clearence, 
-                      properties_from_tool=self.properties_from_tool)
+                      properties_from_tool=self.properties_from_tool, add_endings=self.add_endings)
 
     def points(self, num=10):
         m, m_n, pitch, pressure_angle_t = self.compute_properties()
@@ -191,16 +193,19 @@ class InvoluteRack(object):
         trans = translation([0., pitch, 0.])
         for i in range(self.z - 1):
             teeth.append(trans(teeth[-1]))
-        teeth = list(np.vstack(teeth))
-        ext1 = np.array(teeth[0]) + np.array([0., a + b - pitch / 2])
-        ext2 = np.array(teeth[-1]) - np.array([0., a + b - pitch / 2])
-        teeth = [ext1.tolist(), ext1.tolist()] + teeth + [ext2.tolist(), ext2.tolist()]
+        teeth = np.vstack(teeth)
+        if self.add_endings:
+            ext1 = teeth[0] + np.array([0., a + b - pitch / 2])
+            ext2 = teeth[-1] - np.array([0., a + b - pitch / 2])
+            teeth = [ext1.tolist(), ext1.tolist()] + teeth.tolist() + [ext2.tolist(), ext2.tolist()]
+        else:
+            teeth = [teeth[0].tolist()] + teeth.tolist() + [teeth[-1].tolist()]
         #teeth.append(list(teeth[-1]))
         teeth[0][0] -= self.thickness
         #teeth.append(list(teeth[0]))
         teeth[-1][0] -= self.thickness
         teeth.append(teeth[0])
-        return(teeth)
+        return np.array(teeth)
 
     def compute_properties(self):
         if self.properties_from_tool: