diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-node-data.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-node-data.spec.js
index d56f56bbb..f9646fdb8 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-node-data.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-node-data.spec.js
@@ -23,10 +23,53 @@ describe('when parsing directions', function () {
     expect(data4Layout.nodes[0].shape).toEqual('rounded');
     expect(data4Layout.nodes[0].label).toEqual('D');
   });
+
+  it('should no matter of there are no leading spaces', function () {
+    const res = flow.parser.parse(`flowchart TB
+      D@{shape: rounded }@`);
+
+    const data4Layout = flow.parser.yy.getData();
+    console.log(data4Layout.nodes);
+    expect(data4Layout.nodes.length).toBe(1);
+    expect(data4Layout.nodes[0].shape).toEqual('rounded');
+    expect(data4Layout.nodes[0].label).toEqual('D');
+  });
+
+  it('should no matter of there are many leading spaces', function () {
+    const res = flow.parser.parse(`flowchart TB
+      D@{       shape: rounded }@`);
+
+    const data4Layout = flow.parser.yy.getData();
+    console.log(data4Layout.nodes);
+    expect(data4Layout.nodes.length).toBe(1);
+    expect(data4Layout.nodes[0].shape).toEqual('rounded');
+    expect(data4Layout.nodes[0].label).toEqual('D');
+  });
+
+  it('should be forgiving with many spaces before teh end', function () {
+    const res = flow.parser.parse(`flowchart TB
+      D@{ shape: rounded          }@`);
+
+    const data4Layout = flow.parser.yy.getData();
+    console.log(data4Layout.nodes);
+    expect(data4Layout.nodes.length).toBe(1);
+    expect(data4Layout.nodes[0].shape).toEqual('rounded');
+    expect(data4Layout.nodes[0].label).toEqual('D');
+  });
+  it('should be possible to add multiple properties on the same line', function () {
+    const res = flow.parser.parse(`flowchart TB
+      D@{ shape: rounded , label: "DD" }@`);
+
+    const data4Layout = flow.parser.yy.getData();
+    console.log(data4Layout.nodes);
+    expect(data4Layout.nodes.length).toBe(1);
+    expect(data4Layout.nodes[0].shape).toEqual('rounded');
+    expect(data4Layout.nodes[0].label).toEqual('DD');
+  });
   it('should be possible to link to a node with more data', function () {
     const res = flow.parser.parse(`flowchart TB
       A --> D@{
-        shape: circle,
+        shape: circle
         icon: "clock"
       }@
 
@@ -46,11 +89,11 @@ describe('when parsing directions', function () {
     const res = flow.parser.parse(`flowchart TB
       A[hello]
       B@{
-        shape: circle,
+        shape: circle
         icon: "clock"
       }@
       C[Hello]@{
-        shape: circle,
+        shape: circle
         icon: "clock"
       }@
       `);
@@ -67,7 +110,7 @@ describe('when parsing directions', function () {
   it('should use handle bracket end (}) character inside the shape data', function () {
     const res = flow.parser.parse(`flowchart TB
       A@{
-        label: "This is }",
+        label: "This is }"
         icon: "clock"
       }@
       `);
@@ -88,4 +131,19 @@ describe('when parsing directions', function () {
     expect(data4Layout.nodes[0].shape).toEqual('diamond');
     expect(data4Layout.nodes[0].label).toEqual('This is a label');
   });
+  it('Multi line strings should be supported', function () {
+    const res = flow.parser.parse(`flowchart TB
+      A@{
+        label: |
+          "This is a
+          multiline string"
+        icon: "clock"
+      }@
+      `);
+
+    const data4Layout = flow.parser.yy.getData();
+    expect(data4Layout.nodes.length).toBe(1);
+    expect(data4Layout.nodes[0].shape).toEqual('squareRect');
+    expect(data4Layout.nodes[0].label).toEqual('This is a<br/>multiline string');
+  });
 });
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
index eb5dc75d0..446da227b 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison
@@ -36,15 +36,11 @@ accDescr\s*"{"\s*                               { this.begin("acc_descr_multilin
 <acc_descr_multiline>[^\}]*                     return "acc_descr_multiline_value";
 // <acc_descr_multiline>.*[^\n]*                {  return "acc_descr_line"}
 
-\@\{                                   { console.log('Pushing state shapeData!'); this.pushState("shapeData");  }
-<shapeData>[^}]                         { console.log('End bracket found: ', yytext); this.pushState("shapeDataEndBracket");}
+\@\{                                    { console.log('Pushing state shapeData!'); this.pushState("shapeData");  }
 <shapeDataEndBracket>[@]                { console.log('This is the end: ', yytext); this.popState();this.popState(); }
-<shapeDataEndBracket>[^@]*               { console.log('something else: ', yytext); return 'SHAPE_DATA'; }
-<shapeData>([^}^@])+     { console.log('Parsed data: ', yytext);  }
+<shapeDataEndBracket>[^@]*              { console.log('SHAPE_DATA: ', yytext); return 'SHAPE_DATA'; }
+<shapeData>@                            { console.log('End bracket found: ', yytext); this.pushState("shapeDataEndBracket");}
 
-// [@\{]                  {this.pushState("shapeData");}
-// <shapeData>[\}][\@]        { console.log('This is the end: ', yytext);this.popState(); }
-// <shapeData>^(?!.*\}@).*     { console.log('Parsed data: ', yytext); return 'SHAPE_DATA';}
 /*
 ---interactivity command---
 'call' adds a callback to the specified node. 'call' can only be specified when