diff --git a/README.md b/README.md
index 71b7a95e..7a591740 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 <p align="center">  
   <strong>Leaflet Plugin For Creating And Editing Geometry Layers</strong><br>  
   Draw, Edit, Drag, Cut, Rotate, Split⭐, Scale⭐, Measure⭐, Snap and Pin⭐ Layers<br>  
-  Supports Markers, CircleMarkers, Polylines, Polygons, Circles, Rectangles, ImageOverlays, LayerGroups, GeoJSON, MultiLineStrings and MultiPolygons  
+  Supports Markers, CircleMarkers, Polylines, Curves, Polygons, Circles, Rectangles, ImageOverlays, LayerGroups, GeoJSON, MultiLineStrings and MultiPolygons  
 </p>  
 <p align="center">  
   <a href="https://badge.fury.io/js/%40geoman-io%2Fleaflet-geoman-free">  
@@ -199,6 +199,7 @@ See the available options in the table below.
 | drawPolyline       | `true`      | Adds button to draw Line.                                                                        |  
 | drawRectangle      | `true`      | Adds button to draw Rectangle.                                                                   |  
 | drawPolygon        | `true`      | Adds button to draw Polygon.                                                                     |  
+| drawCurve          | `true`      | Adds button to draw Curve.                                                                     |  
 | drawCircle         | `true`      | Adds button to draw Circle.                                                                      |  
 | editMode           | `true`      | Adds button to toggle Edit Mode for all layers.                                                  |  
 | dragMode           | `true`      | Adds button to toggle Drag Mode for all layers.                                                  |  
@@ -229,6 +230,11 @@ The options will persist, even when the mode is enabled/disabled via the toolbar
   
 All available options for drawing and editing are specified in the sections below.
 
+#### Drawing curves
+The drawing of curves is enabled by default, if [Leaflet.curve](https://github.com/elfalem/Leaflet.curve) is imported. Otherwise the tool will not be available.
+At the moment, the feature to detect self intersection is not available for curves. Similarly, the cutting tool won't work on them.
+
+
 ### Draw Mode
 
 Use Draw Mode on a map like this:
@@ -244,7 +250,7 @@ map.pm.enableDraw('Polygon', {
 map.pm.disableDraw();
 ```
 
-Currently available shapes are `Marker`, `CircleMarker`, `Circle`, `Line`, `Rectangle`, `Polygon` and `Cut`.
+Currently available shapes are `Marker`, `CircleMarker`, `Circle`, `Line`, `Curve`, `Rectangle`, `Polygon` and `Cut`.
 
 The following methods are available on `map.pm`:
 
@@ -759,7 +765,7 @@ The following options are additionally to the [Draw](#draw-mode) and [Edit Mode]
 
 | Option        | Default  | Description                                                                                                                                                                                                            |
 | :------------ | :------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| snappingOrder | `Array`  | Prioritize the order of snapping. Default: `['Marker','CircleMarker','Circle','Line','Polygon','Rectangle']`.                                                                                                          |
+| snappingOrder | `Array`  | Prioritize the order of snapping. Default: `['Marker','CircleMarker','Circle','Line','Polygon','Rectangle','Curve']`.                                                                                                          |
 | layerGroup    | `map`    | add the created layers to a layergroup instead to the map.                                                                                                                                                             |
 | panes         | `Object` | Defines in which [panes](https://leafletjs.com/reference-1.7.1.html#map-pane) the layers and helper vertices are created. Default: `{ vertexPane: 'markerPane', layerPane: 'overlayPane', markerPane: 'markerPane' }`. |
 
diff --git a/cypress/integration/curve.spec.js b/cypress/integration/curve.spec.js
new file mode 100644
index 00000000..7cbd251a
--- /dev/null
+++ b/cypress/integration/curve.spec.js
@@ -0,0 +1,213 @@
+describe('Draw & Edit Curve', () => {
+  // map and leaflet object
+
+  const mapSelector = '#map';
+
+  it('doesnt finish single point curves', () => {
+    cy.toolbarButton('curve').click();
+
+    cy.get(mapSelector).click(90, 250).click(200, 250);
+
+    cy.toolbarButton('edit').click();
+
+    cy.hasVertexMarkers(0);
+  });
+
+  it('removes last vertex', () => {
+    cy.toolbarButton('curve').click();
+
+    cy.get(mapSelector)
+      .click(190, 250)
+      .trigger('mousedown', 500, 250)
+      .trigger('mousemove', 500, 300)
+      .trigger('mousemove', 400, 350)
+      .trigger('mouseup')
+
+    cy.hasVertexMarkers(3); // 2 + mouse
+
+    cy.get('.button-container.active .action-removeLastVertex').click();
+
+    cy.hasVertexMarkers(2); // first + mouse
+
+    cy.get('.button-container.active .action-removeLastVertex').click();
+
+    cy.hasVertexMarkers(0); // remove all
+  });
+
+  it('respects custom style', () => {
+    cy.window().then(({ map }) => {
+      map.on('pm:create', (e) => {
+        e.layer.pm.enable({
+          allowSelfIntersection: false,
+          snappable: false,
+          snapDistance: 20,
+        });
+
+        e.layer.setStyle({ color: 'black' });
+      });
+
+      map.pm.enableDraw('Curve', {
+        snappable: false,
+        snapDistance: 20,
+        allowSelfIntersection: true,
+        finishOn: 'dblclick',
+        templineStyle: {
+          color: 'orange',
+          dashArray: [10, 10],
+          weight: 5,
+        },
+        hintlineStyle: {
+          color: 'orange',
+          dashArray: [10, 10],
+          weight: 1,
+        },
+        pathOptions: {
+          fill: true,
+          color: 'orange',
+          fillColor: 'yellow',
+          dashArray: [10, 10],
+          weight: 5,
+          fillOpacity: 1,
+          opacity: 1,
+        },
+      });
+    });
+
+    cy.get(mapSelector)
+      .click(120, 150)
+      .click(120, 100)
+      .click(300, 100)
+      .click(300, 200)
+      .click(120, 150);
+
+    cy.toolbarButton('curve').click();
+
+    cy.get(mapSelector)
+      .click(320, 150)
+      .click(320, 100)
+      .click(400, 100)
+      .click(400, 200)
+      .click(320, 150);
+
+    cy.toolbarButton('edit').click();
+
+    cy.window().then(({ map, L }) => {
+      map.eachLayer((l) => {
+        if (l instanceof L.Curve) expect(l.options.color).to.equal('black');
+      });
+    });
+  });
+
+  it('draws and edits a curve', () => {
+    cy.hasLayers(1);
+
+    // activate curve drawing
+    cy.toolbarButton('curve')
+      .click()
+      .closest('.button-container')
+      .should('have.class', 'active');
+
+    // draw a curve
+    cy.get(mapSelector)
+      .click(190, 250)
+      .trigger('mousedown', 500, 250)
+      .trigger('mousemove', 500, 300)
+      .trigger('mousemove', 400, 350)
+      .trigger('mouseup')
+      .click(190, 250)
+
+    // button should be disabled after successful draw
+    cy.toolbarButton('curve')
+      .closest('.button-container')
+      .should('have.not.class', 'active');
+
+    cy.hasLayers(3);
+
+    // enable global edit mode
+    cy.toolbarButton('edit').click();
+
+    cy.hasVertexMarkers(3);
+
+    // click the second marker (cubic edit)
+    cy.get('.marker-icon').eq(1).click();
+
+    // now there should be 2 editing handles
+    cy.hasHandleMarkers(2);
+
+    // rightclick on a vertex-marker to delete it
+    cy.get('.marker-icon:not(.marker-edit-handle)')
+      .eq(1)
+      .trigger('contextmenu');
+
+    cy.hasVertexMarkers(2);
+    // handle markers should disappear
+    cy.hasHandleMarkers(0);
+    // disable global edit mode
+    cy.toolbarButton('edit').click();
+
+    // there should be no markers anymore
+    cy.hasVertexMarkers(0);
+  });
+
+  it('enable continueDrawing', () => {
+    cy.window().then(({ map }) => {
+      map.pm.setGlobalOptions({ continueDrawing: true });
+    });
+
+    cy.toolbarButton('curve').click();
+
+    // draw a line with the curve tool
+    
+    cy.get(mapSelector)
+      .click(150, 250)
+      .trigger('mousedown', 160, 50)
+      .trigger('mousemove', 250, 300)
+      .trigger('mousemove', 250, 300)
+      .trigger('mouseup')
+      .click(150, 250)
+
+    cy.get(mapSelector)
+      .click(300, 250)
+      .trigger('mousedown', 250, 50)
+      .trigger('mousemove', 300, 300)
+      .trigger('mousemove', 300, 300)
+      .trigger('mouseup')
+      .click(300, 250)
+
+    cy.toolbarButton('edit').click();
+    cy.hasVertexMarkers(6);
+  });
+
+
+  it('requireSnapToFinish', () => {
+    cy.window().then(({ map }) => {
+      map.pm.setGlobalOptions({
+        requireSnapToFinish: true,
+        snapSegment: false,
+      });
+    });
+
+    cy.toolbarButton('polygon').click();
+    cy.get(mapSelector)
+      .click(150, 250)
+      .click(160, 50)
+      .click(250, 50)
+      .click(150, 250);
+
+    cy.toolbarButton('curve').click();
+    cy.get(mapSelector).click(350, 250).click(300, 160).click(190, 60);
+
+    cy.window().then(({ map }) => {
+      map.pm.Draw.Curve._finishShape();
+      expect(1).to.eq(map.pm.getGeomanDrawLayers().length);
+    });
+
+    cy.get(mapSelector).click(250, 50);
+
+    cy.window().then(({ map }) => {
+      map.pm.Draw.Curve._finishShape();
+      expect(2).to.eq(map.pm.getGeomanDrawLayers().length);
+    });
+  });
+
+});
diff --git a/cypress/integration/polygon.spec.js b/cypress/integration/polygon.spec.js
index 8c428662..97cf6e5b 100644
--- a/cypress/integration/polygon.spec.js
+++ b/cypress/integration/polygon.spec.js
@@ -825,10 +825,10 @@ describe('Draw & Edit Poly', () => {
       .click(150, 250);
 
     cy.get(mapSelector)
-      .click(230, 230)
+      .click(230, 250)
       .click(250, 250)
       .click(250, 300)
-      .click(230, 230);
+      .click(230, 250);
 
     cy.toolbarButton('edit').click();
     cy.hasVertexMarkers(6);
diff --git a/cypress/integration/rectangle.spec.js b/cypress/integration/rectangle.spec.js
index d75911cc..681d461d 100644
--- a/cypress/integration/rectangle.spec.js
+++ b/cypress/integration/rectangle.spec.js
@@ -66,10 +66,10 @@ describe('Draw Rectangle', () => {
 
     cy.toolbarButton('cut').click();
     cy.get(mapSelector)
-      .click(226, 389)
+      .click(226, 350)
       .click(230, 105)
-      .click(270, 396)
-      .click(226, 389);
+      .click(270, 350)
+      .click(226, 350);
 
     cy.toolbarButton('cut').click();
     cy.get(mapSelector)
diff --git a/cypress/integration/toolbar.spec.js b/cypress/integration/toolbar.spec.js
index a1c9e87c..8b7fb331 100644
--- a/cypress/integration/toolbar.spec.js
+++ b/cypress/integration/toolbar.spec.js
@@ -326,7 +326,7 @@ describe('Testing the Toolbar', () => {
         oneBlock: true,
       });
       cy.get('.leaflet-pm-toolbar.leaflet-pm-topleft').then((container) => {
-        expect(container[0].children.length).to.equal(11);
+        expect(container[0].children.length).to.equal(12);
       });
     });
   });
@@ -366,7 +366,7 @@ describe('Testing the Toolbar', () => {
         title: 'Display text on hover button',
       });
       cy.get('.leaflet-pm-toolbar.leaflet-pm-topright').then((container) => {
-        expect(container[0].children.length).to.equal(6);
+        expect(container[0].children.length).to.equal(7);
       });
       cy.get('.leaflet-pm-toolbar.leaflet-pm-topleft').then((container) => {
         expect(container[0].children.length).to.equal(6);
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index d4fe5dbe..be62dae0 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -105,6 +105,12 @@ Cypress.Commands.add('hasVertexMarkers', (count) => {
   });
 });
 
+Cypress.Commands.add('hasHandleMarkers', (count) => {
+  cy.get('.marker-edit-handle').should(($p) => {
+    expect($p).to.have.length(count);
+  });
+});
+
 Cypress.Commands.add('hasTotalVertexMarkers', (count) => {
   cy.get('.marker-icon').should(($p) => {
     expect($p).to.have.length(count);
diff --git a/demo/index.html b/demo/index.html
index 0c3d0a5d..cffb4f82 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -40,7 +40,8 @@ <h2>Editing A Layer Group</h2>
       </article>
     </div>
     <script src="https://unpkg.com/leaflet@latest/dist/leaflet.js"></script>
-    <script src="../dist/leaflet-geoman.min.js"></script>
+    <script src="https://unpkg.com/@elfalem/leaflet-curve@latest/dist/leaflet.curve.js"></script>
+    <script src="../dist/leaflet-geoman.min.js"></script> 
     <!-- You can change from the local source to the cdn: -->
     <!-- <script src="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.min.js"></script>   -->
     <script src="demo.js"></script>
diff --git a/index.html b/index.html
index b557433e..3aec4dca 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
     />
     <link rel="stylesheet" href="dist/leaflet-geoman.css" />
     <script src="https://unpkg.com/leaflet@latest/dist/leaflet.js"></script>
+    <script src="https://unpkg.com/@elfalem/leaflet-curve@latest/dist/leaflet.curve.js"></script>
     <script src="./node_modules/prosthetic-hand/dist/prosthetic-hand.js"></script>
     <!--
             <script src="../../leaflet-measure-path/leaflet-measure-path.js"></script>
diff --git a/leaflet-geoman.d.ts b/leaflet-geoman.d.ts
index 8ab4df2c..f015529e 100644
--- a/leaflet-geoman.d.ts
+++ b/leaflet-geoman.d.ts
@@ -447,6 +447,7 @@ declare module 'leaflet' {
       | 'Marker'
       | 'Circle'
       | 'Line'
+      | 'Curve'
       | 'Rectangle'
       | 'Polygon'
       | 'Cut'
@@ -554,6 +555,7 @@ declare module 'leaflet' {
       buttonTitles?: {
         drawMarkerButton?: string;
         drawPolyButton?: string;
+        drawCurveButton?: string;
         drawLineButton?: string;
         drawCircleButton?: string;
         drawRectButton?: string;
@@ -576,6 +578,7 @@ declare module 'leaflet' {
       | 'drawMarker'
       | 'drawCircleMarker'
       | 'drawPolyline'
+      | 'drawCurve'
       | 'drawRectangle'
       | 'drawPolygon'
       | 'drawCircle'
@@ -720,7 +723,7 @@ declare module 'leaflet' {
       /** Add the created layers to a layergroup instead to the map. */
       layerGroup?: L.Map | L.LayerGroup;
 
-      /** Prioritize the order of snapping. Default: ['Marker','CircleMarker','Circle','Line','Polygon','Rectangle']. */
+      /** Prioritize the order of snapping. Default: ['Marker','CircleMarker','Circle','Line','Polygon','Rectangle','Curve']. */
       snappingOrder: SUPPORTED_SHAPES[];
 
       /** Defines in which panes the layers and helper vertices are created. Default: { vertexPane: 'markerPane', layerPane: 'overlayPane', markerPane: 'markerPane' } */
@@ -1057,6 +1060,9 @@ declare module 'leaflet' {
       /** Adds button to draw Polygon (default:true) */
       drawPolygon?: boolean;
 
+      /** Adds button to draw Curve (default:true) */
+      drawCurve?: boolean;
+
       /** Adds button to draw Circle (default:true) */
       drawCircle?: boolean;
 
diff --git a/src/assets/icons/Curve.svg b/src/assets/icons/Curve.svg
new file mode 100644
index 00000000..79412987
--- /dev/null
+++ b/src/assets/icons/Curve.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 16 16" class="bi bi-bezier" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" d="M0 10.5A1.5 1.5 0 0 1 1.5 9h1A1.5 1.5 0 0 1 4 10.5v1A1.5 1.5 0 0 1 2.5 13h-1A1.5 1.5 0 0 1 0 11.5v-1zm1.5-.5a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1zm10.5.5A1.5 1.5 0 0 1 13.5 9h1a1.5 1.5 0 0 1 1.5 1.5v1a1.5 1.5 0 0 1-1.5 1.5h-1a1.5 1.5 0 0 1-1.5-1.5v-1zm1.5-.5a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1zM6 4.5A1.5 1.5 0 0 1 7.5 3h1A1.5 1.5 0 0 1 10 4.5v1A1.5 1.5 0 0 1 8.5 7h-1A1.5 1.5 0 0 1 6 5.5v-1zM7.5 4a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1z"/>
+  <path d="M6 4.5H1.866a1 1 0 1 0 0 1h2.668A6.517 6.517 0 0 0 1.814 9H2.5c.123 0 .244.015.358.043a5.517 5.517 0 0 1 3.185-3.185A1.503 1.503 0 0 1 6 5.5v-1zm3.957 1.358A1.5 1.5 0 0 0 10 5.5v-1h4.134a1 1 0 1 1 0 1h-2.668a6.517 6.517 0 0 1 2.72 3.5H13.5c-.123 0-.243.015-.358.043a5.517 5.517 0 0 0-3.185-3.185z"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/translations/cz.json b/src/assets/translations/cz.json
index 9c4b5927..87e01ead 100644
--- a/src/assets/translations/cz.json
+++ b/src/assets/translations/cz.json
@@ -3,6 +3,7 @@
     "placeMarker": "Kliknutím vytvoříte značku",
     "firstVertex": "Kliknutím vytvoříte první objekt",
     "continueLine": "Kliknutím pokračujte v kreslení",
+    "dragCurve": "Tažením upravte křivku ",
     "finishLine": "Kliknutí na libovolnou existující značku pro dokončení",
     "finishPoly": "Vyberte první bod pro dokončení",
     "finishRect": "Klikněte pro dokončení",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Přidat značku",
     "drawPolyButton": "Nakreslit polygon",
+    "drawCurveButton": "Nakreslit bezier",
     "drawLineButton": "Nakreslit křivku",
     "drawCircleButton": "Nakreslit kruh",
     "drawRectButton": "Nakreslit obdélník",
diff --git a/src/assets/translations/da.json b/src/assets/translations/da.json
index e581e990..5cc291e0 100644
--- a/src/assets/translations/da.json
+++ b/src/assets/translations/da.json
@@ -3,6 +3,7 @@
     "placeMarker": "Tryk for at placere en markør",
     "firstVertex": "Tryk for at placere det første punkt",
     "continueLine": "Tryk for at fortsætte linjen",
+    "dragCurve": "Træk for at justere kurven",
     "finishLine": "Tryk på et eksisterende punkt for at afslutte",
     "finishPoly": "Tryk på det første punkt for at afslutte",
     "finishRect": "Tryk for at afslutte",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Placer markør",
     "drawPolyButton": "Tegn polygon",
+    "drawCurveButton": "Tegn bezier",
     "drawLineButton": "Tegn linje",
     "drawCircleButton": "Tegn cirkel",
     "drawRectButton": "Tegn firkant",
diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json
index 16932168..4fbc7895 100644
--- a/src/assets/translations/de.json
+++ b/src/assets/translations/de.json
@@ -3,6 +3,7 @@
     "placeMarker": "Platziere den Marker mit Klick",
     "firstVertex": "Platziere den ersten Marker mit Klick",
     "continueLine": "Klicke, um weiter zu zeichnen",
+    "dragCurve": "Ziehen Sie, um die Kurve anzupassen",
     "finishLine": "Beende mit Klick auf existierenden Marker",
     "finishPoly": "Beende mit Klick auf ersten Marker",
     "finishRect": "Beende mit Klick",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Marker zeichnen",
     "drawPolyButton": "Polygon zeichnen",
+    "drawCurveButton": "Bezier zeichnen",
     "drawLineButton": "Polyline zeichnen",
     "drawCircleButton": "Kreis zeichnen",
     "drawRectButton": "Rechteck zeichnen",
diff --git a/src/assets/translations/el.json b/src/assets/translations/el.json
index 285add09..4bd69d40 100644
--- a/src/assets/translations/el.json
+++ b/src/assets/translations/el.json
@@ -3,6 +3,7 @@
     "placeMarker": "Κάντε κλικ για να τοποθετήσετε Δείκτη",
     "firstVertex": "Κάντε κλικ για να τοποθετήσετε το πρώτο σημείο",
     "continueLine": "Κάντε κλικ για να συνεχίσετε να σχεδιάζετε",
+    "dragCurve": "Σύρετε για να προσαρμόσετε την καμπύλη",
     "finishLine": "Κάντε κλικ σε οποιονδήποτε υπάρχον σημείο για να ολοκληρωθεί",
     "finishPoly": "Κάντε κλικ στο πρώτο σημείο για να τελειώσετε",
     "finishRect": "Κάντε κλικ για να τελειώσετε",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Σχεδίαση Δείκτη",
     "drawPolyButton": "Σχεδίαση Πολυγώνου",
+    "drawCurveButton": "Σχεδίαση καμπύλη",
     "drawLineButton": "Σχεδίαση Γραμμής",
     "drawCircleButton": "Σχεδίαση Κύκλου",
     "drawRectButton": "Σχεδίαση Ορθογωνίου",
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index 6ae0b95a..78f328b9 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -3,6 +3,7 @@
     "placeMarker": "Click to place marker",
     "firstVertex": "Click to place first vertex",
     "continueLine": "Click to continue drawing",
+    "dragCurve": "Drag to adjust the curve",
     "finishLine": "Click any existing marker to finish",
     "finishPoly": "Click first marker to finish",
     "finishRect": "Click to finish",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Draw Marker",
     "drawPolyButton": "Draw Polygons",
+    "drawCurveButton": "Draw curve",
     "drawLineButton": "Draw Polyline",
     "drawCircleButton": "Draw Circle",
     "drawRectButton": "Draw Rectangle",
diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json
index e6024683..0fce2cbb 100644
--- a/src/assets/translations/es.json
+++ b/src/assets/translations/es.json
@@ -3,6 +3,7 @@
     "placeMarker": "Presiona para colocar un marcador",
     "firstVertex": "Presiona para colocar el primer vértice",
     "continueLine": "Presiona para continuar dibujando",
+    "dragCurve": "Arrastra para ajustar la curva",
     "finishLine": "Presiona cualquier marcador existente para finalizar",
     "finishPoly": "Presiona el primer marcador para finalizar",
     "finishRect": "Presiona para finalizar",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Dibujar Marcador",
     "drawPolyButton": "Dibujar Polígono",
+    "drawCurveButton": "Dibujar curva",
     "drawLineButton": "Dibujar Línea",
     "drawCircleButton": "Dibujar Circulo",
     "drawRectButton": "Dibujar Rectángulo",
diff --git a/src/assets/translations/fa.json b/src/assets/translations/fa.json
index 70e439ee..3edb9cc5 100644
--- a/src/assets/translations/fa.json
+++ b/src/assets/translations/fa.json
@@ -3,6 +3,7 @@
     "placeMarker": "کلیک برای جانمایی نشان",
     "firstVertex": "کلیک برای رسم اولین رأس",
     "continueLine": "کلیک برای ادامه رسم",
+    "dragCurve": "برای تنظیم منحنی بکشید",
     "finishLine": "کلیک روی هر نشان موجود برای پایان",
     "finishPoly": "کلیک روی اولین نشان برای پایان",
     "finishRect": "کلیک برای پایان",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "درج نشان",
     "drawPolyButton": "رسم چندضلعی",
+    "drawCurveButton": "یک منحنی بکشید ",
     "drawLineButton": "رسم خط",
     "drawCircleButton": "رسم دایره",
     "drawRectButton": "رسم چهارضلعی",
diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json
index bb9e8de2..cd4f5cda 100644
--- a/src/assets/translations/fr.json
+++ b/src/assets/translations/fr.json
@@ -3,6 +3,7 @@
     "placeMarker": "Cliquez pour placer un marqueur",
     "firstVertex": "Cliquez pour placer le premier sommet",
     "continueLine": "Cliquez pour continuer à dessiner",
+    "dragCurve": "Faites glisser pour ajuster la courbe",
     "finishLine": "Cliquez sur n'importe quel marqueur pour terminer",
     "finishPoly": "Cliquez sur le premier marqueur pour terminer",
     "finishRect": "Cliquez pour terminer",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Placer des marqueurs",
     "drawPolyButton": "Dessiner des polygones",
+    "drawCurveButton": "Dessiner des courbes",
     "drawLineButton": "Dessiner des polylignes",
     "drawCircleButton": "Dessiner un cercle",
     "drawRectButton": "Dessiner un rectangle",
diff --git a/src/assets/translations/hu.json b/src/assets/translations/hu.json
index b47a8f60..e4a5186c 100644
--- a/src/assets/translations/hu.json
+++ b/src/assets/translations/hu.json
@@ -3,6 +3,7 @@
     "placeMarker": "Kattintson a jelölő elhelyezéséhez",
     "firstVertex": "Kattintson az első pont elhelyezéséhez",
     "continueLine": "Kattintson a következő pont elhelyezéséhez",
+    "dragCurve": "Húzza a görbe beállításához",
     "finishLine": "A befejezéshez kattintson egy meglévő pontra",
     "finishPoly": "A befejezéshez kattintson az első pontra",
     "finishRect": "Kattintson a befejezéshez",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Jelölő rajzolása",
     "drawPolyButton": "Poligon rajzolása",
+    "drawCurveButton": "Görbék rajzolása",
     "drawLineButton": "Vonal rajzolása",
     "drawCircleButton": "Kör rajzolása",
     "drawRectButton": "Négyzet rajzolása",
diff --git a/src/assets/translations/id.json b/src/assets/translations/id.json
index 129f05c4..9264883e 100644
--- a/src/assets/translations/id.json
+++ b/src/assets/translations/id.json
@@ -3,6 +3,7 @@
     "placeMarker": "Klik untuk menempatkan marker",
     "firstVertex": "Klik untuk menempatkan vertex pertama",
     "continueLine": "Klik untuk meneruskan digitasi",
+    "dragCurve": "Seret untuk melaraskan lengkung",
     "finishLine": "Klik pada sembarang marker yang ada untuk mengakhiri",
     "finishPoly": "Klik marker pertama untuk mengakhiri",
     "finishRect": "Klik untuk mengakhiri",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Digitasi Marker",
     "drawPolyButton": "Digitasi Polygon",
+    "drawCurveButton": "Digitasi Curve",
     "drawLineButton": "Digitasi Polyline",
     "drawCircleButton": "Digitasi Lingkaran",
     "drawRectButton": "Digitasi Segi Empat",
diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json
index 21f7e08e..d146b4c0 100644
--- a/src/assets/translations/it.json
+++ b/src/assets/translations/it.json
@@ -3,6 +3,7 @@
     "placeMarker": "Clicca per posizionare un Marker",
     "firstVertex": "Clicca per posizionare il primo vertice",
     "continueLine": "Clicca per continuare a disegnare",
+    "dragCurve": "Trascina per regolare la curva ",
     "finishLine": "Clicca qualsiasi marker esistente per terminare",
     "finishPoly": "Clicca il primo marker per terminare",
     "finishRect": "Clicca per terminare",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Disegna Marker",
     "drawPolyButton": "Disegna Poligoni",
+    "drawCurveButton": "Disegna Curva",
     "drawLineButton": "Disegna Polilinea",
     "drawCircleButton": "Disegna Cerchio",
     "drawRectButton": "Disegna Rettangolo",
diff --git a/src/assets/translations/nl.json b/src/assets/translations/nl.json
index 92acb090..cd4f8274 100644
--- a/src/assets/translations/nl.json
+++ b/src/assets/translations/nl.json
@@ -3,6 +3,7 @@
     "placeMarker": "Klik om een marker te plaatsen",
     "firstVertex": "Klik om het eerste punt te plaatsen",
     "continueLine": "Klik om te blijven tekenen",
+    "dragCurve": "Sleep om de curve aan te passen",
     "finishLine": "Klik op een bestaand punt om te beëindigen",
     "finishPoly": "Klik op het eerst punt om te beëindigen",
     "finishRect": "Klik om te beëindigen",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Plaats Marker",
     "drawPolyButton": "Teken een vlak",
+    "drawCurveButton": "Teken een curve",
     "drawLineButton": "Teken een lijn",
     "drawCircleButton": "Teken een cirkel",
     "drawRectButton": "Teken een vierkant",
diff --git a/src/assets/translations/no.json b/src/assets/translations/no.json
index 09774f6d..9c38e498 100644
--- a/src/assets/translations/no.json
+++ b/src/assets/translations/no.json
@@ -3,6 +3,7 @@
     "placeMarker": "Klikk for å plassere punkt",
     "firstVertex": "Klikk for å plassere første punkt",
     "continueLine": "Klikk for å tegne videre",
+    "dragCurve": "Dra for å justere kurven",
     "finishLine": "Klikk på et eksisterende punkt for å fullføre",
     "finishPoly": "Klikk første punkt for å fullføre",
     "finishRect": "Klikk for å fullføre",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Tegn Punkt",
     "drawPolyButton": "Tegn Flate",
+    "drawCurveButton": "Tegn Curve",
     "drawLineButton": "Tegn Linje",
     "drawCircleButton": "Tegn Sirkel",
     "drawRectButton": "Tegn rektangel",
diff --git a/src/assets/translations/pl.json b/src/assets/translations/pl.json
index 1c4c2938..4d0e0dd5 100644
--- a/src/assets/translations/pl.json
+++ b/src/assets/translations/pl.json
@@ -3,6 +3,7 @@
     "placeMarker": "Kliknij, aby ustawić znacznik",
     "firstVertex": "Kliknij, aby ustawić pierwszy punkt",
     "continueLine": "Kliknij, aby kontynuować rysowanie",
+    "dragCurve": "Przeciągnij, aby dostosować krzywą",
     "finishLine": "Kliknij dowolny punkt, aby zakończyć",
     "finishPoly": "Kliknij pierwszy punkt, aby zakończyć",
     "finishRect": "Kliknij, aby zakończyć",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Narysuj znacznik",
     "drawPolyButton": "Narysuj wielokąt",
+    "drawCurveButton": "Narysuj krzywą",
     "drawLineButton": "Narysuj ścieżkę",
     "drawCircleButton": "Narysuj koło",
     "drawRectButton": "Narysuj prostokąt",
diff --git a/src/assets/translations/pt_br.json b/src/assets/translations/pt_br.json
index 790d38e5..90a256b7 100644
--- a/src/assets/translations/pt_br.json
+++ b/src/assets/translations/pt_br.json
@@ -3,6 +3,7 @@
     "placeMarker": "Clique para posicionar o marcador",
     "firstVertex": "Clique para posicionar o primeiro vértice",
     "continueLine": "Clique para continuar desenhando",
+    "dragCurve": "Arraste para ajustar a curva",
     "finishLine": "Clique em qualquer marcador existente para finalizar",
     "finishPoly": "Clique no primeiro ponto para fechar o polígono",
     "finishRect": "Clique para finalizar",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Desenhar um marcador",
     "drawPolyButton": "Desenhar um polígono",
+    "drawCurveButton": "Desenhe uma curva ",
     "drawLineButton": "Desenhar uma polilinha",
     "drawCircleButton": "Desenhar um círculo",
     "drawRectButton": "Desenhar um retângulo",
diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json
index 01c3d5d6..2c8c25ba 100644
--- a/src/assets/translations/ro.json
+++ b/src/assets/translations/ro.json
@@ -3,6 +3,7 @@
     "placeMarker": "Adaugă un punct",
     "firstVertex": "Apasă aici pentru a adăuga primul Vertex",
     "continueLine": "Apasă aici pentru a continua desenul",
+    "dragCurve": "Trageți pentru a ajusta curba",
     "finishLine": "Apasă pe orice obiect pentru a finisa desenul",
     "finishPoly": "Apasă pe primul obiect pentru a finisa",
     "finishRect": "Apasă pentru a finisa",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Adaugă o bulină",
     "drawPolyButton": "Desenează un poligon",
+    "drawCurveButton": "Desenează o curbă",
     "drawLineButton": "Desenează o linie",
     "drawCircleButton": "Desenează un cerc",
     "drawRectButton": "Desenează un dreptunghi",
diff --git a/src/assets/translations/ru.json b/src/assets/translations/ru.json
index 37e8c002..2920caa6 100644
--- a/src/assets/translations/ru.json
+++ b/src/assets/translations/ru.json
@@ -3,6 +3,7 @@
     "placeMarker": "Нажмите, чтобы нанести маркер",
     "firstVertex": "Нажмите, чтобы нанести первый объект",
     "continueLine": "Нажмите, чтобы продолжить рисование",
+    "dragCurve": "Перетащите, чтобы настроить кривую",
     "finishLine": "Нажмите любой существующий маркер для завершения",
     "finishPoly": "Выберите первую точку, чтобы закончить",
     "finishRect": "Нажмите, чтобы закончить",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Добавить маркер",
     "drawPolyButton": "Рисовать полигон",
+    "drawCurveButton": "Рисовать изгиб",
     "drawLineButton": "Рисовать кривую",
     "drawCircleButton": "Рисовать круг",
     "drawRectButton": "Рисовать прямоугольник",
diff --git a/src/assets/translations/sv.json b/src/assets/translations/sv.json
index f5c96404..c6e0a3ff 100644
--- a/src/assets/translations/sv.json
+++ b/src/assets/translations/sv.json
@@ -3,6 +3,7 @@
     "placeMarker": "Klicka för att placera markör",
     "firstVertex": "Klicka för att placera första hörnet",
     "continueLine": "Klicka för att fortsätta rita",
+    "dragCurve": "Dra för att justera kurvan",
     "finishLine": "Klicka på en existerande punkt för att slutföra",
     "finishPoly": "Klicka på den första punkten för att slutföra",
     "finishRect": "Klicka för att slutföra",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Rita Markör",
     "drawPolyButton": "Rita Polygoner",
+    "drawCurveButton": "Rita kurvor",
     "drawLineButton": "Rita Linje",
     "drawCircleButton": "Rita Cirkel",
     "drawRectButton": "Rita Rektangel",
diff --git a/src/assets/translations/tr.json b/src/assets/translations/tr.json
index 956aa99b..c188e7b5 100644
--- a/src/assets/translations/tr.json
+++ b/src/assets/translations/tr.json
@@ -3,6 +3,7 @@
     "placeMarker": "İşaretçi yerleştirmek için tıklayın",
     "firstVertex": "İlk tepe noktasını yerleştirmek için tıklayın",
     "continueLine": "Çizime devam etmek için tıklayın",
+    "dragCurve": "Eğriyi ayarlamak için sürükleyin",
     "finishLine": "Bitirmek için mevcut herhangi bir işaretçiyi tıklayın",
     "finishPoly": "Bitirmek için ilk işaretçiyi tıklayın",
     "finishRect": "Bitirmek için tıklayın",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Çizim İşaretçisi",
     "drawPolyButton": "Çokgenler çiz",
+    "drawCurveButton": "Eğriler çiz",
     "drawLineButton": "Çoklu çizgi çiz",
     "drawCircleButton": "Çember çiz",
     "drawRectButton": "Dikdörtgen çiz",
diff --git a/src/assets/translations/ua.json b/src/assets/translations/ua.json
index 1ee3d9cc..8a39eff4 100644
--- a/src/assets/translations/ua.json
+++ b/src/assets/translations/ua.json
@@ -3,6 +3,7 @@
     "placeMarker": "Натисніть, щоб нанести маркер",
     "firstVertex": "Натисніть, щоб нанести першу вершину",
     "continueLine": "Натисніть, щоб продовжити малювати",
+    "dragCurve": "Перетягніть, щоб налаштувати криву",
     "finishLine": "Натисніть будь-який існуючий маркер для завершення",
     "finishPoly": "Виберіть перший маркер, щоб завершити",
     "finishRect": "Натисніть, щоб завершити",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "Малювати маркер",
     "drawPolyButton": "Малювати полігон",
+    "drawCurveButton": "Малювати криву",
     "drawLineButton": "Малювати криву",
     "drawCircleButton": "Малювати коло",
     "drawRectButton": "Малювати прямокутник",
diff --git a/src/assets/translations/zh.json b/src/assets/translations/zh.json
index e835fac0..f4e2210c 100644
--- a/src/assets/translations/zh.json
+++ b/src/assets/translations/zh.json
@@ -3,6 +3,7 @@
     "placeMarker": "单击放置标记",
     "firstVertex": "单击放置首个顶点",
     "continueLine": "单击继续绘制",
+    "dragCurve": "拖动以调整曲线",
     "finishLine": "单击任何存在的标记以完成",
     "finishPoly": "单击第一个标记以完成",
     "finishRect": "单击完成",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "绘制标记",
     "drawPolyButton": "绘制多边形",
+    "drawCurveButton": "绘制曲线",
     "drawLineButton": "绘制线段",
     "drawCircleButton": "绘制圆形",
     "drawRectButton": "绘制长方形",
diff --git a/src/assets/translations/zh_tw.json b/src/assets/translations/zh_tw.json
index 9517c92d..53e4b776 100644
--- a/src/assets/translations/zh_tw.json
+++ b/src/assets/translations/zh_tw.json
@@ -3,6 +3,7 @@
     "placeMarker": "單擊放置標記",
     "firstVertex": "單擊放置第一個頂點",
     "continueLine": "單擊繼續繪製",
+    "dragCurve": "拖動以調整曲線",
     "finishLine": "單擊任何存在的標記以完成",
     "finishPoly": "單擊第一個標記以完成",
     "finishRect": "單擊完成",
@@ -18,6 +19,7 @@
   "buttonTitles": {
     "drawMarkerButton": "放置標記",
     "drawPolyButton": "繪製多邊形",
+    "drawCurveButton": "绘制曲线",
     "drawLineButton": "繪製線段",
     "drawCircleButton": "繪製圓形",
     "drawRectButton": "繪製方形",
diff --git a/src/css/controls.css b/src/css/controls.css
index 2e976523..48abc783 100644
--- a/src/css/controls.css
+++ b/src/css/controls.css
@@ -59,6 +59,9 @@
 .leaflet-pm-toolbar .leaflet-pm-icon-polygon {
   background-image: url('../assets/icons/Polygon.svg');
 }
+.leaflet-pm-toolbar .leaflet-pm-icon-curve {
+  background-image: url('../assets/icons/Curve.svg');
+}
 .leaflet-pm-toolbar .leaflet-pm-icon-polyline {
   background-image: url('../assets/icons/Line.svg');
 }
@@ -185,4 +188,4 @@
 
 .control-icon.pm-disabled {
   filter: opacity(0.6);
-}
+}
\ No newline at end of file
diff --git a/src/css/layers.css b/src/css/layers.css
index 577ac184..ff045999 100644
--- a/src/css/layers.css
+++ b/src/css/layers.css
@@ -9,6 +9,12 @@
   outline: 0;
   transition: opacity ease 0.3s;
 }
+.marker-icon.marker-edit-handle, .marker-icon.marker-edit-handle:focus {
+  background-color: #ff3c3cb7;
+  border: 1px solid #bb2d2d;
+  width: 10px !important;
+  height: 10px !important;
+}
 
 .marker-icon-middle,
 .marker-icon-middle:focus {
diff --git a/src/js/Draw/L.PM.Draw.Curve.js b/src/js/Draw/L.PM.Draw.Curve.js
new file mode 100644
index 00000000..aa9cfd39
--- /dev/null
+++ b/src/js/Draw/L.PM.Draw.Curve.js
@@ -0,0 +1,453 @@
+import Draw from './L.PM.Draw';
+
+import { getTranslation } from '../helpers';
+import CurveCommon from '../Mixins/CurveCommon';
+
+Draw.Curve = Draw.extend({
+  includes: CurveCommon,
+  initialize(map) {
+    this._map = map;
+    this._shape = 'Curve';
+    this.toolbarButtonName = 'drawCurve';
+    this._doesSelfIntersect = false;
+  },
+  enable(options) {
+    L.Util.setOptions(this, options);
+    // enable draw mode
+    this._enabled = true;
+
+    // create a new layergroup
+    this._layerGroup = new L.LayerGroup();
+    this._layerGroup._pmTempLayer = true;
+    this._layerGroup.addTo(this._map);
+
+    // this is the hintmarker on the mouse cursor
+    this._hintMarker = L.marker(this._map.getCenter(), {
+      interactive: false, // always vertex marker below will be triggered from the click event -> _finishShape #911
+      zIndexOffset: 100,
+      icon: L.divIcon({ className: 'marker-icon cursor-marker' }),
+    });
+    this._setPane(this._hintMarker, 'vertexPane');
+    this._hintMarker._pmTempLayer = true;
+    this._layerGroup.addLayer(this._hintMarker);
+    // show the hintmarker if the option is set
+    if (this.options.cursorMarker) {
+      L.DomUtil.addClass(this._hintMarker._icon, 'visible');
+    }
+
+    // add tooltip to hintmarker
+    if (this.options.tooltips) {
+      this._hintMarker
+        .bindTooltip(getTranslation('tooltips.firstVertex'), {
+          permanent: true,
+          offset: L.point(0, 10),
+          direction: 'bottom',
+
+          opacity: 0.8,
+        })
+        .openTooltip();
+    }
+
+    // change map cursor
+    this._map._container.style.cursor = 'crosshair';
+
+    // this is the final curve
+    this._layer = L.curve([], this.options.templineStyle);
+    this._setPane(this._layer, 'layerPane');
+    this._layer._pmTempLayer = true;
+    this._layerGroup.addLayer(this._layer);
+    
+    this._futurePath = L.curve([], this.options.hintlineStyle).addTo(this._map);
+    this._setPane(this._futurePath, 'layerPane');
+    this._futurePath._pmTempLayer = true;
+    this._layerGroup.addLayer(this._futurePath);
+    this._futurePathDef = [];
+    this._futureDest = null;
+    this.initVars();
+    this.previousInteractions = {};
+
+    // init listeners 
+    L.DomEvent.on(this._map.getContainer(), 'touchstart mousedown', this._simDownEvent, this);
+    this.supportsTouch = 'ontouchstart' in window || navigator.msMaxTouchPoints;
+    
+    if(this.supportsTouch) {
+      document.addEventListener('contextmenu', this.preventAndStopPropagation); // allow for taking your time on touch screens
+    }
+    else {
+      this._map.on('mousemove', this._mouseMoveDragging, this);
+    }
+
+    // finish on layer event
+    // #http://leafletjs.com/reference-1.2.0.html#interactive-layer-click
+    if (this.options.finishOn && this.options.finishOn !== 'snap') {
+      this._map.on(this.options.finishOn, this._finishShape, this);
+    }
+
+    // prevent zoom on double click if finishOn is === dblclick
+    if (this.options.finishOn === 'dblclick') {
+      this.tempMapDoubleClickZoomState = this._map.doubleClickZoom._enabled;
+
+      if (this.tempMapDoubleClickZoomState) {
+        this._map.doubleClickZoom.disable();
+      }
+    }
+
+    // sync hint marker with mouse cursor
+    this._map.on('mousemove', this._syncHintMarker, this);
+
+    // toggle the draw button of the Toolbar in case drawing mode got enabled without the button
+    this._map.pm.Toolbar.toggleButton(this.toolbarButtonName, true);
+
+    // an array used in the snapping mixin.
+    // TODO: think about moving this somewhere else?
+    this._otherSnapLayers = [];
+    // fire drawstart event
+    this._fireDrawStart();
+    this._setGlobalDrawMode();
+  },
+  disable() {
+    // disable draw mode
+    // cancel, if drawing mode isn't even enabled
+    if (!this._enabled) {
+      return;
+    }
+    if(this.supportsTouch) {
+      document.removeEventListener('contextmenu', this.preventAndStopPropagation); // allow for taking your time on touch screens
+    }
+    this._enabled = false;
+
+    // reset cursor
+    this._map._container.style.cursor = '';
+
+    // unbind listeners
+    L.DomEvent.off(this._map.getContainer(), 'touchstart mousedown', this._simDownEvent, this);
+		this._map.off('mousemove', this._mouseMoveDragging, this);
+    this._map.off('mousemove', this._syncHintMarker, this);
+    if (this.options.finishOn && this.options.finishOn !== 'snap') {
+      this._map.off(this.options.finishOn, this._finishShape, this);
+    }
+
+    if (this.tempMapDoubleClickZoomState) {
+      this._map.doubleClickZoom.enable();
+    }
+
+    // remove layer
+    this._map.removeLayer(this._layerGroup);
+    // cleanup curve variables
+    this.delete();
+    delete this._futurePathDef;
+    // toggle the draw button of the Toolbar in case drawing mode got disabled without the button
+    this._map.pm.Toolbar.toggleButton(this.toolbarButtonName, false);
+
+    // cleanup snapping
+    if (this.options.snappable) {
+      this._cleanupSnapping();
+    }
+
+    // fire drawend event
+    this._fireDrawEnd();
+    this._setGlobalDrawMode();
+  },
+  enabled() {
+    return this._enabled;
+  },
+  toggle(options) {
+    if (this.enabled()) {
+      this.disable();
+    } else {
+      this.enable(options);
+    }
+  },
+  preventAndStopPropagation(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  },
+  _syncHintMarker(e) {
+    // move the cursor marker
+    this._hintMarker.setLatLng(e.latlng);
+
+    // if snapping is enabled, do it, only if not dragging, because it can be inconvenient
+    if (this.options.snappable && !this.draggingControl) {
+      const fakeDragEvent = e;
+      fakeDragEvent.target = this._hintMarker;
+      this._handleSnapping(fakeDragEvent);
+    }
+  },
+  _simulateEvent(e) {
+    const evt = {
+      originalEvent: e,
+      target: this._layer,
+    };
+    // we expect in the function to get the clicked latlng / point
+    evt.containerPoint = this._map.mouseEventToContainerPoint(e);
+    evt.latlng = this._map.containerPointToLatLng(evt.containerPoint);
+    // check if similar event has already been fired, to avoid duplicate handling
+    if (this._alreadyFired(evt) || e.type === 'pointercancel') return false;
+    return evt;
+  },
+  _simDownEvent(e) {
+    const evt = this._simulateEvent(e);
+    if (evt) {
+      this._onTouch(evt);
+    }
+  },
+  _simMoveEvent(e) {
+    const evt = this._simulateEvent(e);
+    if (evt) this._mouseMoveDragging(evt);
+  },
+  _simUpEvent(e) {
+    const evt = this._simulateEvent(e);
+    if (evt) {
+      this._drawConfirm(evt);
+    }
+  },
+  _alreadyFired(e) {
+    const eventType = e.originalEvent.type;
+    // two last chars are discriminant to identify wanted event types
+    const lastCharsEvent = eventType.substring(eventType.length - 2);
+    // const eventTypes = this.eventTypes[lastCharsEvent];
+    if (lastCharsEvent in this.previousInteractions && this.previousInteractions[lastCharsEvent].equals(e.latlng)) {
+      delete this.previousInteractions[lastCharsEvent];
+      return true;
+    }
+    this.previousInteractions[lastCharsEvent] = e.latlng;
+    return false;
+  },
+  // called on click / touch on the map
+  _onTouch(e) {
+    // check if we touched a marker, in which case the touch event is handled by the marker handler
+    if (e.originalEvent.target.classList.contains('leaflet-marker-icon')) { return; } 
+    this._futureDest = [e.latlng.lat, e.latlng.lng];
+    L.DomEvent.on(this._map.getContainer(), 'touchend mouseup', this._simUpEvent, this);
+    L.DomUtil.disableImageDrag();
+    L.DomUtil.disableTextSelection();
+    if (!this._instructions.length) return;
+
+    if (this.supportsTouch) {
+      L.DomEvent.on(this._map.getContainer(), 'touchmove mousemove', this._simMoveEvent, this);
+      document.addEventListener('selectstart', this.preventAndStopPropagation);
+    }
+    this._updateFuturePath(e); // for touch screens, where future path is not updated since there is no hover
+    this._setTooltipText(true);
+    this._map.dragging.disable();
+  },
+  
+  // called continuously while the mouse is pressed after adding a new point
+	_mouseMoveDragging(e) {
+    // long touch seem to trigger mousemove on touch devices
+    if (this.supportsTouch && e.originalEvent.type === 'mousemove') return;
+		if (!this._instructions.length) return;
+		if (this._futureDest != null) {
+      this.draggingControl = true;
+		}
+		else {
+      this.draggingControl = false;
+		}
+		this._updateFuturePath(e);
+	},
+
+  // called when the mouse is release (mouseup)
+	_drawConfirm(e) {
+		this._map.dragging.enable();
+		this.draggingControl = false;
+    L.DomUtil.enableImageDrag();
+    L.DomUtil.enableTextSelection();
+		this._futureDest = null;
+    L.DomEvent.off(this._map.getContainer(), 'touchend mouseup', this._simUpEvent, this);
+
+    if (this.supportsTouch) {
+      L.DomEvent.off(this._map.getContainer(), 'touchmove mousemove', this._simMoveEvent, this);
+      document.removeEventListener('selectstart', this.preventAndStopPropagation);
+    }
+
+    // if it is the first point, create the marker
+		if (!this._instructions.length) { 
+			const firstMarker = this._createGoTo([e.latlng.lat, e.latlng.lng], 'M');
+			firstMarker.on('click', this._finishClose, this);
+		}
+		else this._appendFuturePoint(e);
+    const lastMarker = this._markers[this._markers.length - 1];
+    this._fireVertexAdded(lastMarker, undefined, lastMarker.getLatLng(), 'Draw');
+    this._setTooltipText();
+	},
+
+  // called when the shape is finished by clicking the first marker
+  _finishClose(e) {
+		// set last point to exact marker location
+		let latlng = e.target.getLatLng();
+		latlng = [latlng.lat, latlng.lng];
+		this._futurePathDef[this._futurePathDef.length - 1] = latlng;
+		// set last control point as well
+		if (this._futurePathDef.length > 3) {
+			this._futurePathDef[this._futurePathDef.length - 2] = latlng;
+		}
+		this._appendFuturePoint(e);
+		this._finishShape(e);
+	},
+  
+  // compute the new path based on the futurePath create by the hovering on the map
+  _appendFuturePoint(e) {
+		if (!this._futurePathDef.length) { return; }
+		this._instructions.push(this._futurePathDef[0]);
+		this._latlngs.push(this._futurePathDef.slice(1));
+		this._updateFinishMarker();
+		this._futurePathDef = [];
+		this._futurePath.setPath([]);
+		this._updatePath();
+    this._updateFuturePath(e);
+	},
+
+  // main part of the computation: depending on previous and if we are dragging, add different control point
+  _updateFuturePath(e) {
+		const lastCoords = this._getLastPoint();
+		const lastLatlngs = this._getLastLatLngs();
+    // assign the coordinate of the click to the hintMarker, that's necessary for
+    // mobile where the marker can't follow a cursor
+    if (!this._hintMarker._snapped && e) {
+      this._hintMarker.setLatLng(e.latlng);
+    }
+    let latlng = this._hintMarker.getLatLng();
+		latlng = [latlng.lat, latlng.lng];
+		const lastInstruction = this._instructions[this._instructions.length - 1];
+		const startPoint = ['M', lastCoords];
+		if (lastInstruction === 'M' || lastInstruction === 'L') {
+			if (this.draggingControl) {
+				this._futurePathDef = ['C', lastCoords, latlng, this._futureDest];
+			}
+			else {
+				this._futurePathDef = ['L', latlng];
+			}
+		}
+		else if (lastInstruction === 'C') {
+			const previousControl = lastLatlngs[1];
+			const symetric = L.PM.Utils.getPointSymetric(lastCoords, previousControl);
+			if (this.draggingControl) {
+				this._futurePathDef = ['C', symetric, latlng, this._futureDest];
+			} else if (previousControl === lastLatlngs[2]) {
+				this._futurePathDef = ['L', latlng];
+			} else {
+				this._futurePathDef = ['C', symetric, latlng, latlng];
+			}
+		}
+		this._futurePath.setPath(startPoint.concat(this._futurePathDef));
+	},
+
+  // updates the last marker to be the actual last control point
+  _updateFinishMarker() {
+		const markerCount = this._markers.length;
+		const lastCoord = this._getLastPoint();
+    let marker;
+		if (markerCount > 1) {
+			marker = this._markers[markerCount - 1];
+      this._markerJustCreated(marker);
+			marker.setLatLng(lastCoord);
+		}
+		else {
+      marker = this._createMarker(lastCoord);
+			marker.on('click', this._finishShape, this);
+		}
+	},
+
+
+  _createGoTo(latlng, instruction) {
+		const marker = this._createMarker(latlng)
+		this._instructions.push(instruction);
+		this._latlngs.push([latlng]);
+		return marker;
+	},
+
+  _removeLastVertex() {
+    // if all coords are gone, cancel drawing
+    if (this._markers.length < 2) {
+      this.disable();  
+      return; 
+    }
+    // remove last instructions
+    this._instructions.pop();
+    this._latlngs.pop();
+    if (this._instructions.length > 1) {
+      // update last marker position
+      this._updateFinishMarker();
+    } else {
+      // remove second marker only if one instruction left
+      const marker = this._markers.pop();
+      this._layerGroup.removeLayer(marker);
+    }
+    // sync the hintline and tooltip again
+    this._setTooltipText();
+    // re-render path, and future path
+		this._updatePath();
+		this._updateFuturePath();
+  },
+
+  _finishShape(e) {
+    // if marker was just created, do not finish
+    // hack for mobile devices where the click event is triggered directly after the marker is placed
+    if (e && e.target._justMoved === true) return;
+
+    // If snap finish is required but the last marker wasn't snapped, do not finish the shape!
+    if (
+      this.options.requireSnapToFinish &&
+      !this._hintMarker._snapped &&
+      !this._isFirstLayer()
+    ) {
+      return;
+    }
+
+    // if there is only one marker (so, one point), don't finish the shape!
+    if (this._markers.length < 2) {
+			return;
+		}
+
+    // create the leaflet shape and add it to the map
+    const path = L.curve(this._layer.getPath(), this.options.pathOptions);
+    this._setPane(path, 'layerPane');
+    this._finishLayer(path);
+    path.addTo(this._map.pm._getContainingLayer());
+    // fire the pm:create event and pass shape and layer
+    this._fireCreate(path);
+
+    if (this.options.snappable) {
+      this._cleanupSnapping();
+    }
+
+    // disable drawing
+    this.disable();
+    if (this.options.continueDrawing) {
+      this.enable();
+    }
+  },
+  _createMarker(latlng) {
+    // create the new marker
+    const marker = new L.Marker(latlng, {
+      draggable: false,
+      icon: L.divIcon({ className: 'marker-icon' }),
+    });
+    this._setPane(marker, 'vertexPane');
+    marker._pmTempLayer = true;
+    this._markerJustCreated(marker);
+    // add it to the map
+    this._layerGroup.addLayer(marker);
+    this._markers.push(marker);
+    return marker;
+  },
+
+  _markerJustCreated(marker){
+    if (!this.supportsTouch) return;
+    marker._justMoved = true
+    setTimeout(() => {
+      marker._justMoved = false;
+    }, 500);
+  },
+
+  _setTooltipText(isPressed) {
+    let text = '';
+    if (isPressed) text = getTranslation('tooltips.dragCurve');
+    else if (this._markers.length === 1) {
+      text = getTranslation('tooltips.continueLine');
+    } else {
+      text = getTranslation('tooltips.finishLine');
+    }
+		this._hintMarker.setTooltipContent(text);
+  },
+});
diff --git a/src/js/Draw/L.PM.Draw.Line.js b/src/js/Draw/L.PM.Draw.Line.js
index fadd0511..d2413f30 100644
--- a/src/js/Draw/L.PM.Draw.Line.js
+++ b/src/js/Draw/L.PM.Draw.Line.js
@@ -12,15 +12,15 @@ Draw.Line = Draw.extend({
   },
   enable(options) {
     L.Util.setOptions(this, options);
-
+    
     // enable draw mode
     this._enabled = true;
-
+    
     // create a new layergroup
     this._layerGroup = new L.LayerGroup();
     this._layerGroup._pmTempLayer = true;
     this._layerGroup.addTo(this._map);
-
+    
     // this is the polyLine that'll make up the polygon
     this._layer = L.polyline([], this.options.templineStyle);
     this._setPane(this._layer, 'layerPane');
diff --git a/src/js/Draw/L.PM.Draw.js b/src/js/Draw/L.PM.Draw.js
index b2fc17b9..30fb9c6f 100644
--- a/src/js/Draw/L.PM.Draw.js
+++ b/src/js/Draw/L.PM.Draw.js
@@ -54,6 +54,7 @@ const Draw = L.Class.extend({
       'Marker',
       'CircleMarker',
       'Line',
+      'Curve',
       'Polygon',
       'Rectangle',
       'Circle',
@@ -91,10 +92,8 @@ const Draw = L.Class.extend({
         )}`
       );
     }
-
     // disable drawing for all shapes
     this.disable();
-
     // enable draw for a shape
     this[shape].enable(options);
   },
diff --git a/src/js/Edit/L.PM.Edit.Curve.js b/src/js/Edit/L.PM.Edit.Curve.js
new file mode 100644
index 00000000..218bd8af
--- /dev/null
+++ b/src/js/Edit/L.PM.Edit.Curve.js
@@ -0,0 +1,392 @@
+import Edit from './L.PM.Edit';
+
+import CurveCommon from '../Mixins/CurveCommon';
+
+import MarkerLimits from '../Mixins/MarkerLimits';
+
+Edit.Curve = Edit.extend({
+  includes: [CurveCommon, MarkerLimits],
+  options: {
+    lineGuideStyle: {
+        color: '#ff3c3c',
+        weight: 2,
+        opacity: 0.7,
+    },
+  },
+  _shape: 'Curve',
+  initialize(layer) {
+    this._layer = layer;
+    this._enabled = false;
+  },
+  enable(options) {
+    L.Util.setOptions(this, options);
+    this._map = this._layer._map;
+
+    // cancel when map isn't available, this happens when the polygon is removed before this fires
+    if (!this._map) {
+      return;
+    }
+
+    // layer is not allowed to edit
+    if (!this.options.allowEditing) {
+      this.disable();
+      return;
+    }
+
+    if (this.enabled()) {
+      // if it was already enabled, disable first
+      // we don't block enabling again because new options might be passed
+      this.disable();
+    }
+
+    // change state
+    this._enabled = true;
+
+    // if polygon gets removed from map, disable edit mode
+    this._layer.on('remove', this._onLayerRemove, this);
+
+    this.init();
+    this._fireEnable();
+  },
+  init() {
+    this._markerGroup = new L.LayerGroup().addTo(this._map);
+    this._markerGroup._pmTempLayer = true;
+    this._editLayers = new L.LayerGroup().addTo(this._map);
+    this._editLayers._pmTempLayer = true;
+    this.initVars();
+    this._initMarkers(this._layer._coords);
+    this.applyOptions();
+    this._setupControlMarkersEdit();
+  },
+
+  reInit() {
+    this.cleanup();
+    this.init();
+  },
+
+  cleanup(poly = this._layer) {
+    poly.pm._markerGroup.clearLayers();
+    poly.pm._markerGroup.removeFrom(this._map);
+    poly.pm._editLayers.clearLayers();
+    poly.pm._editLayers.removeFrom(this._map);
+    this.delete();
+  },
+
+  disable(poly = this._layer) {
+    // if it's not enabled, it doesn't need to be disabled
+    if (!this.enabled()) {
+      return false;
+    }
+
+    // prevent disabling if polygon is being dragged
+    if (poly.pm._dragging) {
+      return false;
+    }
+    poly.pm._enabled = false;
+    this.cleanup(poly);
+
+    // remove onRemove listener
+    this._layer.off('remove', this._onLayerRemove, this);
+
+    // remove draggable class
+    const el = poly._path ? poly._path : this._layer._renderer._container;
+    L.DomUtil.removeClass(el, 'leaflet-pm-draggable');
+
+    if (this._layerEdited) {
+      this._fireUpdate();
+    }
+    this._layerEdited = false;
+    this._fireDisable();
+    return true;
+
+  },
+  enabled() {
+    return this._enabled;
+  },
+  toggleEdit(options) {
+    if (!this.enabled()) {
+      this.enable(options);
+    } else {
+      this.disable();
+    }
+    return this.enabled();
+  },
+  applyOptions() {
+    if (this.options.snappable) {
+      this._initSnappableMarkers();
+    } else {
+      this._disableSnapping();
+    }
+  },
+  _onLayerRemove(e) {
+    this.disable(e.target);
+  },
+
+  _initMarkers(coords) {
+		let lastInstruction = null;
+		let i = 0;
+		let coordsAccum = [];
+		while (i < coords.length) {
+			const current = coords[i];
+			i += 1;
+			if (typeof current === 'string') {
+				if (coordsAccum.length) {
+					this.addFromCoords(lastInstruction, coordsAccum);
+					coordsAccum = [];
+				}
+				lastInstruction = current;
+			}
+      else coordsAccum.push(current);
+		}
+		this.addFromCoords(lastInstruction, coordsAccum);
+    this._updatePath();
+	},
+
+  addFromCoords(instruction, coords) {
+		switch (instruction) {
+			case 'L':
+			case 'M':
+				this._createGoTo(coords[0], instruction);
+				break;
+			case 'Q':
+				this._createQuadraticFromCoords(coords);
+				break;
+			case 'C':
+				this._createCubicFromCoords(coords);
+				break;
+      default: break;
+		}
+	},
+
+  _createGoTo(latlng, instruction) {
+    const marker = this._createMarker(latlng).addTo(this._markerGroup);
+    this._markers.push( marker);
+		this._instructions.push(instruction);
+		this._latlngs.push([latlng]);
+	},
+
+  // unused for now
+  _createQuadraticFromCoords(coords) {
+		const control = coords[0];
+		const dest = coords[1];
+		const markerDest = this._createMarker(dest).addTo(this._markerGroup);
+		this._markers.push( markerDest);
+		this._instructions.push('Q');
+		this._latlngs.push([control, dest]);
+	},
+
+	_createCubicFromCoords(coords) {
+		const firstControl = coords[0];
+		const secondControl = coords[1];
+		const dest = coords[2];
+		const markerDest = this._createMarker(dest).addTo(this._markerGroup);
+		this._markers.push(markerDest);
+		this._instructions.push('C');
+		this._latlngs.push([firstControl, secondControl, dest]);
+	},
+
+  _setupControlMarkersEdit() {
+    for (let i = 0; i < this._markers.length; i+=1) {
+      this._setupControlMarkerEdit(i);
+    }
+    this.markerSelected = 0;
+  },
+  
+  _setupControlMarkerEdit(markerIndex) {
+    const marker = this._markers[markerIndex];
+    marker._index = markerIndex;
+    const nbInstructions = this._instructions.length;
+    const currentInstruction = this._instructions[markerIndex];
+    const isLast = markerIndex === nbInstructions - 1;
+    const nextIsCubic = markerIndex < nbInstructions - 1 && this._instructions[markerIndex + 1] === 'C';
+    const currentLatlngs = this._latlngs[markerIndex];
+    const destSameSecondControl = currentLatlngs[2] === currentLatlngs[1];
+    if (currentInstruction === 'C') {
+      if (nextIsCubic && !destSameSecondControl) {
+        marker._setupDouble = true;
+        marker._coordsIndex = [[markerIndex, 2]];
+      }
+      else {
+        marker._coordsIndex = [[markerIndex, 2]];
+        // move the second control point (if first defined) and the destination
+        if (!isLast) { marker._coordsIndex.push([markerIndex, 1]); }
+        // one handle for destination, one handle for second control point
+        else if (!destSameSecondControl) {
+            marker._setupSimple = true;
+        }
+      }
+    }
+    else {
+      // update current position,
+      marker._coordsIndex = [[markerIndex, 0]];
+      // update first control point of next if cubic
+      if (nextIsCubic) { marker._coordsIndex.push([markerIndex + 1, 0]); }
+    }
+    marker.on('drag click', this._onDragMarker, this);
+    this._setupDragStartEnd(marker);
+    if (!this.options.preventMarkerRemoval) {
+      marker.on(this.options.removeVertexOn, this._removeVertex, this);
+    }
+	},
+
+  _setupDragStartEnd(marker) {
+    marker.on('dragstart', () => {
+        this._layerEdited = true;
+        marker._dragging = true;
+    });
+    marker.on('dragend', () => {
+        marker._dragging = false;
+    });
+  },
+
+  _setupSimpleHandle(e) {
+    const marker = e.target;
+    const markerIndex = marker._index;
+    const currentCoords = this._latlngs[markerIndex];
+    const markerControl = this._createMarker(currentCoords[1], true).addTo(this._editLayers);
+    const line = L.polyline([currentCoords[1], currentCoords[2]], this.options.lineGuideStyle);
+    line._pmTempLayer = true;
+    line.addTo(this._editLayers);
+    const lineArgs = { line, coordsIndex: [[markerIndex, 1], [markerIndex, 2]] };
+    this._initMarkerArgs(markerControl, markerIndex, [[markerIndex, 1]], null, lineArgs);
+    marker._translateArgs = [markerControl];
+    marker._line = lineArgs;
+  },
+
+  // create 3 handles : one for the destination of current, one for the 2nd control of current, one for the 1st control of next
+  // the marker for the point already exists : attach a callback
+  _setupDoubleHandle(e) {
+    const marker = e.target;
+    const markerIndex = marker._index;
+    const currentCoords = this._latlngs[markerIndex];
+    const nextCoords = this._latlngs[markerIndex + 1];
+    const line = L.polyline([currentCoords[1], nextCoords[0]], this.options.lineGuideStyle)
+    line._pmTempLayer = true;
+    line.addTo(this._editLayers);
+    const lineArgs = { line, coordsIndex: [[markerIndex, 1], [markerIndex + 1, 0]] };
+    const markerControl2 = this._createMarker(currentCoords[1], true).addTo(this._editLayers);
+    const markerControl1 = this._createMarker(nextCoords[0], true).addTo(this._editLayers);
+    this._initMarkerArgs(markerControl1, markerIndex, [[markerIndex + 1, 0]], {ref: [markerIndex, 2], marker: markerControl2}, lineArgs);
+    this._initMarkerArgs(markerControl2, markerIndex, [[markerIndex, 1]], {ref: [markerIndex, 2], marker: markerControl1}, lineArgs);
+    marker._line = lineArgs;
+    marker._translateArgs = [markerControl1, markerControl2];
+  },
+    
+  _initMarkerArgs(marker, index, coords, symetric, lineArgs) {
+      marker._coordsIndex = coords
+      marker._index = index;
+      if (symetric) { marker._symetricArgs = symetric; }
+      marker._line = lineArgs;
+      marker.on('drag', this._onDragMarker, this);
+      this._setupDragStartEnd(marker);
+  },
+  
+  _removeVertex(e) {
+    if (this._instructions.length <= 2) {
+      this._layer.remove();
+      return;
+    }
+    const marker = e.target;
+    const markerIndex = marker._index;
+    this._removeInstruction(markerIndex);
+    this._updatePath();
+    this.reInit();
+    this._fireVertexRemoved(marker, markerIndex);
+  },
+
+  _updateSymetric(latlng, symetricArgs) {
+      const indexRef = symetricArgs.ref;
+      const indexChanged = symetricArgs.marker._coordsIndex[0];
+      const pointRef = this._latlngs[indexRef[0]][indexRef[1]];
+      const symetric = L.PM.Utils.getPointSymetric(pointRef, latlng);
+      this._latlngs[indexChanged[0]][indexChanged[1]] = symetric;
+      symetricArgs.marker.setLatLng(symetric);
+  },
+
+  _updateTranslate(e, translatedMarkers) {
+    const marker = e.target;
+    const latlng = marker.getLatLng();
+    if (!marker.previousLatlng) {
+      marker.previousLatlng = latlng;
+    }
+    const difLat = latlng.lat - marker.previousLatlng.lat; 
+    const difLng = latlng.lng - marker.previousLatlng.lng;
+    marker.previousLatlng = latlng;
+    for (let i = 0; i < translatedMarkers.length; i+=1) {
+      const translatedMarker = translatedMarkers[i];
+      const coordsIndex = translatedMarker._coordsIndex[0];
+      const coords = this._latlngs[coordsIndex[0]][coordsIndex[1]];
+      const newCoords = [coords[0] + difLat, coords[1] + difLng];
+      this._latlngs[coordsIndex[0]][coordsIndex[1]] = newCoords;
+      translatedMarker.setLatLng(newCoords);
+    }
+  },
+
+  _updateLine(lineObj) {
+    const poly = lineObj.line;
+    const coords =  lineObj.coordsIndex;
+    const origin = this._latlngs[coords[0][0]][coords[0][1]];
+    const dest = this._latlngs[coords[1][0]][coords[1][1]];
+    poly.setLatLngs([origin, dest]);
+  },
+
+  _onDragMarker(e) {
+    const markerCoords = e.target.getLatLng();
+    const indexMarker = e.target._index;
+    const coordsArray = e.target._coordsIndex;
+    const latlng = [markerCoords.lat, markerCoords.lng];
+    if (indexMarker !== this.markerSelected  ) {
+      this._editLayers.clearLayers();
+      if (e.target._setupDouble) { this._setupDoubleHandle(e); }
+      if (e.target._setupSimple) { this._setupSimpleHandle(e); }
+      this.markerSelected = indexMarker;
+    }
+    if (e.target._line) {
+      this._updateLine(e.target._line);
+    }
+    const symetric = e.target._symetricArgs;
+    if (symetric) {
+      this._updateSymetric(latlng, symetric);
+    }
+    if (e.target._translateArgs) {
+        this._updateTranslate(e, e.target._translateArgs);
+    }
+    for (let i = 0; i < coordsArray.length; i+=1) {
+        const coords = coordsArray[i];
+        this._latlngs[coords[0]][coords[1]] = latlng;
+    }
+    this._updatePath();
+  },
+
+
+  // creates initial markers for coordinates
+  _createMarker(latlng, isHandle = false) {
+    const cssClass = `marker-icon ${isHandle ? 'marker-edit-handle' : ''}`;
+    const marker = new L.Marker(latlng, {
+      draggable: true,
+      icon: L.divIcon({ className: cssClass }),
+    });
+    this._setPane(marker, 'vertexPane');
+
+    marker._pmTempLayer = true;
+
+    if (this.options.rotate) {
+      marker.on('dragstart', this._onRotateStart, this);
+      marker.on('drag', this._onRotate, this);
+      marker.on('dragend', this._onRotateEnd, this);
+    } else {
+      marker.on('click', this._onVertexClick, this);
+    }
+    this._markerGroup.addLayer(marker);
+
+    return marker;
+  },
+  _onVertexClick(e) {
+    const vertex = e.target;
+    if (vertex._dragging) {
+      return;
+    }
+    this._fireVertexClick(e, vertex._index);
+  },
+
+});
diff --git a/src/js/L.PM.Map.js b/src/js/L.PM.Map.js
index bf48dcaf..bbb2a8ac 100644
--- a/src/js/L.PM.Map.js
+++ b/src/js/L.PM.Map.js
@@ -31,6 +31,7 @@ const Map = L.Class.extend({
         'Line',
         'Polygon',
         'Rectangle',
+        'Curve',
       ],
       panes: {
         vertexPane: 'markerPane',
diff --git a/src/js/L.PM.Utils.js b/src/js/L.PM.Utils.js
index bf3256a7..d5daea0f 100644
--- a/src/js/L.PM.Utils.js
+++ b/src/js/L.PM.Utils.js
@@ -15,6 +15,7 @@ const Utils = {
     map.eachLayer((layer) => {
       if (
         layer instanceof L.Polyline ||
+        (L.Curve && layer instanceof L.Curve) ||
         layer instanceof L.Marker ||
         layer instanceof L.Circle ||
         layer instanceof L.CircleMarker ||
@@ -23,10 +24,9 @@ const Utils = {
         layers.push(layer);
       }
     });
-
     // filter out layers that don't have the leaflet-geoman instance
     layers = layers.filter((layer) => !!layer.pm);
-
+    
     // filter out everything that's leaflet-geoman specific temporary stuff
     layers = layers.filter((layer) => !layer._pmTempLayer);
 
@@ -187,6 +187,11 @@ const Utils = {
     const pointB = L.point(pointA.x + radiusInPx, pointA.y);
     return map.distance(map.unproject(pointB), center);
   },
+  getPointSymetric(ref, point) {
+    const lat = 2 * ref[0] - point[0];
+    const lng = 2 * ref[1] - point[1];
+    return [lat, lng]
+  },
 };
 
 export default Utils;
diff --git a/src/js/L.PM.js b/src/js/L.PM.js
index 87657bb4..55b0bd67 100644
--- a/src/js/L.PM.js
+++ b/src/js/L.PM.js
@@ -17,6 +17,7 @@ import Toolbar from './Toolbar/L.PM.Toolbar';
 import Draw from './Draw/L.PM.Draw';
 import './Draw/L.PM.Draw.Marker';
 import './Draw/L.PM.Draw.Line';
+import './Draw/L.PM.Draw.Curve';
 import './Draw/L.PM.Draw.Polygon';
 import './Draw/L.PM.Draw.Rectangle';
 import './Draw/L.PM.Draw.Circle';
@@ -27,6 +28,7 @@ import Edit from './Edit/L.PM.Edit';
 import './Edit/L.PM.Edit.LayerGroup';
 import './Edit/L.PM.Edit.Marker';
 import './Edit/L.PM.Edit.Line';
+import './Edit/L.PM.Edit.Curve';
 import './Edit/L.PM.Edit.Polygon';
 import './Edit/L.PM.Edit.Rectangle';
 import './Edit/L.PM.Edit.Circle';
@@ -124,6 +126,22 @@ L.PM = L.PM || {
 
     L.Polyline.addInitHook(initPolyline);
 
+    function initCurve() {
+      this.pm = undefined;
+      if (L.PM.optIn) {
+        if (this.options.pmIgnore === false) {
+          this.pm = new L.PM.Edit.Curve(this);
+        }
+      } else if (!this.options.pmIgnore) {
+        this.pm = new L.PM.Edit.Curve(this);
+      }
+    }
+
+    if (L.Curve) {
+      L.Curve.addInitHook(initCurve);
+    }
+
+
     function initPolygon() {
       this.pm = undefined;
 
diff --git a/src/js/Mixins/CurveCommon.js b/src/js/Mixins/CurveCommon.js
new file mode 100644
index 00000000..44245626
--- /dev/null
+++ b/src/js/Mixins/CurveCommon.js
@@ -0,0 +1,66 @@
+
+const CurveCommon = {
+	initVars() {
+		this._markers = [];
+		this._instructions = []; 	// array of SVG instructions (['M', 'Q', ...])
+		this._latlngs = [];				// array of corresponding lat/lng coordinates, varying in size depending on the instruction
+	},
+
+	delete() {
+		delete this._markers;
+		delete this._instructions;
+		delete this._latlngs;	 
+	},
+
+	_getLastPoint() {
+		const lastCoords = this._getLastLatLngs();
+		return lastCoords[lastCoords.length - 1];
+	},
+
+	_getLastPointFromLatLngs(latLngIndex) {
+		const coords = this._latlngs[latLngIndex];
+		return coords[coords.length - 1];
+	},
+
+	_getLastLatLngs() {
+		return this._latlngs[this._latlngs.length - 1];
+	},
+
+	_getReconstructed() {
+		const reconstructed = [];
+		for (let i = 0; i < this._instructions.length; i += 1) {
+			reconstructed.push(this._instructions[i]);
+			reconstructed.push(...this._latLngToArray(this._latlngs[i]));
+		}
+		return reconstructed;
+	},
+
+	_updatePath() {
+		this._layer.setPath(this._getReconstructed());
+	},
+
+	_removeInstruction(index) {
+		if (index >= this._latlngs.length) return;
+		// replace next control point as the first one (M)
+		if (index === 0) {
+      this._instructions[1] = 'M';
+      this._latlngs[1] = [this._getLastPointFromLatLngs(1)];
+    }
+		this._instructions.splice(index, 1);
+		this._latlngs.splice(index, 1);
+	},
+
+
+	_latLngToArray(latlngArray) {
+		const asArrays = [];
+		for (let i = 0; i < latlngArray.length; i += 1) {
+			let latlng = latlngArray[i];
+			if (!Array.isArray(latlng)) { latlng = [latlng.lat, latlng.lng];}
+			asArrays.push(latlng);
+		}
+		return asArrays;
+	},
+
+};
+
+export default CurveCommon;
\ No newline at end of file
diff --git a/src/js/Mixins/Dragging.js b/src/js/Mixins/Dragging.js
index c9779a90..717d1b89 100644
--- a/src/js/Mixins/Dragging.js
+++ b/src/js/Mixins/Dragging.js
@@ -1,3 +1,5 @@
+import { pathToCoordsOnly, reconciliateCoords } from '../helpers';
+
 const DragMixin = {
   enableLayerDrag() {
     // layer is not allowed to dragged
@@ -309,7 +311,6 @@ const DragMixin = {
           // do this recursively as coords might be nested
           return moveCoords(currentLatLng);
         }
-
         // move the coord and return it
         return {
           lat: currentLatLng.lat + deltaLatLng.lat,
@@ -346,6 +347,11 @@ const DragMixin = {
       ]);
       // set new coordinates and redraw
       this._layer.setBounds(newCoords);
+    } else if (L.Curve && this._layer instanceof L.Curve) {
+      // create the new coordinates array, picking coorinates attributes, filtering the instructions
+      const newCoords = moveCoords(pathToCoordsOnly(this._layer));
+      // apply new coordinates 
+      reconciliateCoords(this._layer, newCoords);
     } else {
       // create the new coordinates array
       const newCoords = moveCoords(this._layer.getLatLngs());
diff --git a/src/js/Mixins/Modes/Mode.Rotate.js b/src/js/Mixins/Modes/Mode.Rotate.js
index 4f03b8d3..873df2d2 100644
--- a/src/js/Mixins/Modes/Mode.Rotate.js
+++ b/src/js/Mixins/Modes/Mode.Rotate.js
@@ -3,7 +3,7 @@ const GlobalRotateMode = {
   enableGlobalRotateMode() {
     this._globalRotateModeEnabled = true;
     const layers = L.PM.Utils.findLayers(this.map).filter(
-      (l) => l instanceof L.Polyline
+      (l) => l instanceof L.Polyline || (L.Curve && l instanceof L.Curve)
     );
     layers.forEach((layer) => {
       if (this._isRelevantForRotate(layer)) {
@@ -28,7 +28,7 @@ const GlobalRotateMode = {
   disableGlobalRotateMode() {
     this._globalRotateModeEnabled = false;
     const layers = L.PM.Utils.findLayers(this.map).filter(
-      (l) => l instanceof L.Polyline
+      (l) => (l instanceof L.Polyline || (L.Curve && l instanceof L.Curve))
     );
     layers.forEach((layer) => {
       layer.pm.disableRotate();
diff --git a/src/js/Mixins/Rotating.js b/src/js/Mixins/Rotating.js
index f7319191..a3ead39e 100644
--- a/src/js/Mixins/Rotating.js
+++ b/src/js/Mixins/Rotating.js
@@ -1,12 +1,12 @@
 import get from 'lodash/get';
 import { _convertLatLngs, _toPoint } from '../helpers/ModeHelper';
-import { copyLatLngs } from '../helpers';
+import { copyLatLngs, reconciliateCoords, getPointsOnCurve } from '../helpers';
+import { all } from 'bluebird';
 
 /**
  * We create a temporary polygon with the same latlngs as the layer that we want to rotate.
  * Why polygon? Because then we have the correct center also for polylines with `layer.getCenter()`.
  * We reference the origin layer as `_rotationLayer`. The rotate listeners (`_onRotate...()`) are only applied to the temp polygon and from there we need to rotate the `_rotationLayer` too.
- *
  */
 
 const RotateMixin = {
@@ -37,7 +37,6 @@ const RotateMixin = {
     const angleDiffRadiant =
       Math.atan2(position.y - origin.y, position.x - origin.x) -
       Math.atan2(previous.y - origin.y, previous.x - origin.x);
-
     // rotate the temp polygon
     this._layer.setLatLngs(
       this._rotateLayer(
@@ -68,15 +67,13 @@ const RotateMixin = {
 
     const oldLatLngs = copyLatLngs(this._rotationLayer);
     // rotate the origin layer
-    this._rotationLayer.setLatLngs(
-      this._rotateLayer(
-        angleDiffRadiant,
-        this._rotationLayer.pm._rotateOrgLatLng,
-        this._rotationOriginLatLng,
-        L.PM.Matrix.init(),
-        this._map
-      )
-    );
+    reconciliateCoords(this._rotationLayer, this._rotateLayer(
+      angleDiffRadiant,
+      this._rotationLayer.pm._rotateOrgLatLng,
+      this._rotationOriginLatLng,
+      L.PM.Matrix.init(),
+      this._map
+    ));
 
     // convert the difference radiant to degrees and add it to the angle before rotation starts
     let angleDiff = (angleDiffRadiant * 180) / Math.PI;
@@ -129,6 +126,10 @@ const RotateMixin = {
     return center;
   },
 
+  getLatLngs(layer) {
+    if (!L.Curve || !(layer instanceof L.Curve)) return layer.getLatLngs();
+    return getPointsOnCurve(layer);
+  },
   /*
    *
    * Public functions f.ex. to disable and enable rotation on the layer directly
@@ -149,7 +150,7 @@ const RotateMixin = {
     };
 
     // we create a temp polygon for rotation
-    this._rotatePoly = L.polygon(this._layer.getLatLngs(), options).addTo(
+    this._rotatePoly = L.polygon(this.getLatLngs(this._layer), options).addTo(
       this._layer._map
     );
     this._rotatePoly.pm._setAngle(this.getAngle());
@@ -182,7 +183,7 @@ const RotateMixin = {
       this._rotatePoly.pm.setOptions({ rotate: false });
       this._rotatePoly = undefined;
       this._rotateOrgLatLng = undefined;
-
+      
       this._layer.off('remove', this.disableRotate, this);
 
       this._rotateEnabled = false;
diff --git a/src/js/Mixins/Snapping.js b/src/js/Mixins/Snapping.js
index 19331914..c7fc25d8 100644
--- a/src/js/Mixins/Snapping.js
+++ b/src/js/Mixins/Snapping.js
@@ -1,4 +1,4 @@
-import { isEmptyDeep, prioritiseSort } from '../helpers';
+import { isEmptyDeep, prioritiseSort, getPointsOnCurve } from '../helpers';
 
 const SnapMixin = {
   _initSnappableMarkers() {
@@ -186,7 +186,8 @@ const SnapMixin = {
         (layer instanceof L.Polyline ||
           layer instanceof L.Marker ||
           layer instanceof L.CircleMarker ||
-          layer instanceof L.ImageOverlay) &&
+          layer instanceof L.ImageOverlay ||
+          (L.Curve && layer instanceof L.Curve)) &&
         layer.options.snapIgnore !== true
       ) {
         // if snapIgnore === false the layer will be always snappable
@@ -222,14 +223,13 @@ const SnapMixin = {
         // debugLine.addTo(map);
       }
     });
-
     // ...except myself
     layers = layers.filter((layer) => this._layer !== layer);
-
+    
     // also remove everything that has no coordinates yet
     layers = layers.filter(
       (layer) =>
-        layer._latlng || (layer._latlngs && !isEmptyDeep(layer._latlngs))
+      layer._coords || layer._latlng || (layer._latlngs && !isEmptyDeep(layer._latlngs))
     );
 
     // finally remove everything that's leaflet-geoman specific temporary stuff
@@ -301,7 +301,7 @@ const SnapMixin = {
     // is this a marker?
     const isMarker =
       layer instanceof L.Marker || layer instanceof L.CircleMarker;
-
+    const isCurve = L.Curve && layer instanceof L.Curve;
     // is it a polygon?
     const isPolygon = layer instanceof L.Polygon;
 
@@ -309,7 +309,10 @@ const SnapMixin = {
     const P = latlng;
 
     // the coords of the layer
-    const latlngs = isMarker ? layer.getLatLng() : layer.getLatLngs();
+    let latlngs;
+    if (isMarker) latlngs = layer.getLatLng();
+    else if (isCurve) latlngs = getPointsOnCurve(layer);
+    else latlngs = layer.getLatLngs();
 
     if (isMarker) {
       // return the info for the marker, no more calculations needed
diff --git a/src/js/Toolbar/L.PM.Toolbar.js b/src/js/Toolbar/L.PM.Toolbar.js
index 515a407e..b21a05fa 100644
--- a/src/js/Toolbar/L.PM.Toolbar.js
+++ b/src/js/Toolbar/L.PM.Toolbar.js
@@ -9,6 +9,7 @@ const Toolbar = L.Class.extend({
     drawMarker: true,
     drawRectangle: true,
     drawPolyline: true,
+    drawCurve: true,
     drawPolygon: true,
     drawCircle: true,
     drawCircleMarker: true,
@@ -112,6 +113,7 @@ const Toolbar = L.Class.extend({
         drawPolyline: 'control-icon leaflet-pm-icon-polyline',
         drawRectangle: 'control-icon leaflet-pm-icon-rectangle',
         drawPolygon: 'control-icon leaflet-pm-icon-polygon',
+        drawCurve: 'control-icon leaflet-pm-icon-curve',
         drawCircle: 'control-icon leaflet-pm-icon-circle',
         drawCircleMarker: 'control-icon leaflet-pm-icon-circle-marker',
         editMode: 'control-icon leaflet-pm-icon-edit',
@@ -123,7 +125,6 @@ const Toolbar = L.Class.extend({
 
     for (const name in buttons) {
       const button = buttons[name];
-
       L.Util.setOptions(button, {
         className: iconClasses.geomanIcons[name],
       });
@@ -233,6 +234,22 @@ const Toolbar = L.Class.extend({
       actions: ['finish', 'removeLastVertex', 'cancel'],
     };
 
+    const drawCurveButton = {
+      title: getTranslation('buttonTitles.drawCurveButton'),
+      className: 'control-icon leaflet-pm-icon-curve',
+      jsClass: 'Curve',
+      onClick: () => {},
+      afterClick: (e, ctx) => {
+        // toggle drawing mode
+        this.map.pm.Draw[ctx.button._button.jsClass].toggle();
+      },
+      doToggle: true,
+      toggleStatus: false,
+      disableOtherButtons: true,
+      position: this.options.position,
+      actions: ['finish', 'removeLastVertex', 'cancel'],
+    };
+
     const drawLineButton = {
       className: 'control-icon leaflet-pm-icon-polyline',
       title: getTranslation('buttonTitles.drawLineButton'),
@@ -380,6 +397,7 @@ const Toolbar = L.Class.extend({
 
     this._addButton('drawMarker', new L.Control.PMButton(drawMarkerButton));
     this._addButton('drawPolyline', new L.Control.PMButton(drawLineButton));
+    if (L.Curve !== undefined) this._addButton('drawCurve', new L.Control.PMButton(drawCurveButton));
     this._addButton('drawRectangle', new L.Control.PMButton(drawRectButton));
     this._addButton('drawPolygon', new L.Control.PMButton(drawPolyButton));
     this._addButton('drawCircle', new L.Control.PMButton(drawCircleButton));
diff --git a/src/js/helpers/index.js b/src/js/helpers/index.js
index 9df94c90..2f95e156 100644
--- a/src/js/helpers/index.js
+++ b/src/js/helpers/index.js
@@ -243,10 +243,47 @@ export function prioritiseSort(key, _sortingOrder, order = 'asc') {
   };
 }
 
+// set new coords for the layer based in newCoords, based on current layer coords, ommiting non-coords elements (for curve)
+// new coords must be an array of L.LatLng
+export function reconciliateCoords(layer, newCoords) {
+  const isCurve = !L.Curve || layer instanceof L.Curve;
+  let index = 0;
+  if (!isCurve) return layer.setLatLngs(newCoords);
+  // for curve, array is always one-dimensional (no nesting)
+  if (newCoords.length == 1 && !newCoords[0].lat) newCoords = newCoords[0];
+  layer.setLatLngs(layer.getLatLngs().map(point => {
+    if (typeof point === 'string') return point;
+    const coords = [newCoords[index].lat, newCoords[index].lng];
+    index += 1;
+    return coords;
+  }));
+}
+
+// retrieve the coordinates only from a curve definition, converting them to L.LatLng objects
+export function pathToCoordsOnly(curveLayer) {
+  return curveLayer.getLatLngs().reduce((filtered, point) => {
+    if (Array.isArray(point)) filtered.push(L.latLng(point))
+    return filtered
+  }, []);
+}
+
+// returns points on the curve that correspond to the marker locations, converting them to L.LatLng
+export function getPointsOnCurve(curveLayer) {
+  return curveLayer.getLatLngs().reduce((coords, command, index, allVals) => {
+    if (Array.isArray(command) && (index === (allVals.length - 1) || !Array.isArray(allVals[index + 1]))) {
+      coords.push(L.latLng(command));
+    }
+    return coords;
+  }, []);
+}
+
 export function copyLatLngs(layer, latlngs = layer.getLatLngs()) {
   if (layer instanceof L.Polygon) {
     return L.polygon(latlngs).getLatLngs();
   }
+  else if (L.Curve && layer instanceof L.Curve) {
+    return [pathToCoordsOnly(layer)];
+  }
   return L.polyline(latlngs).getLatLngs();
 }