diff --git a/README.md b/README.md
index c41e985b1..6fc2ed3b3 100644
--- a/README.md
+++ b/README.md
@@ -130,11 +130,11 @@ yarn add mermaid
 
 ## Further reading
 
-* [Usage](http://knsv.github.io/mermaid/#usage)
-* [Flowchart syntax](http://knsv.github.io/mermaid/#flowcharts-basic-syntax)
-* [Sequence diagram syntax](http://knsv.github.io/mermaid/#sequence-diagrams)
-* [Mermaid client](http://knsv.github.io/mermaid/#mermaid-cli)
-* [Demos](http://knsv.github.io/mermaid/#demos)
+* [Usage](https://mermaidjs.github.io/usage.html)
+* [Flowchart syntax](https://mermaidjs.github.io/flowchart.html)
+* [Sequence diagram syntax](https://mermaidjs.github.io/sequenceDiagram.html)
+* [Mermaid CLI](https://mermaidjs.github.io/mermaidCLI.html)
+* [Demos](https://mermaidjs.github.io/demos.html)
 
 
 # Request for assistance
diff --git a/src/diagrams/classDiagram/parser/classDiagram.jison b/src/diagrams/classDiagram/parser/classDiagram.jison
index 4c8cef763..f633d144c 100644
--- a/src/diagrams/classDiagram/parser/classDiagram.jison
+++ b/src/diagrams/classDiagram/parser/classDiagram.jison
@@ -1,5 +1,5 @@
 /** mermaid
- *  http://knsv.github.io/mermaid/
+ *  https://mermaidjs.github.io/
  *  (c) 2015 Knut Sveidqvist
  *  MIT license.
  */
diff --git a/src/diagrams/example/parser/example.jison b/src/diagrams/example/parser/example.jison
index 45f949c8a..42a14fe5a 100644
--- a/src/diagrams/example/parser/example.jison
+++ b/src/diagrams/example/parser/example.jison
@@ -1,5 +1,5 @@
 /** mermaid
- *  http://knsv.github.io/mermaid/
+ *  https://mermaidjs.github.io/
  *  (c) 2015 Knut Sveidqvist
  *  MIT license.
  */
@@ -50,4 +50,4 @@ message
 	: 'say' TXT { $$ = $1.substring(1).trim().replace(/\\n/gm, "\n"); }
 	;
 
-%%
\ No newline at end of file
+%%
diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
index ca6e5178d..82e827be4 100644
--- a/src/diagrams/flowchart/parser/flow.jison
+++ b/src/diagrams/flowchart/parser/flow.jison
@@ -1,5 +1,5 @@
 /** mermaid
- *  http://knsv.github.io/mermaid/
+ *  https://mermaidjs.github.io/
  *  (c) 2015 Knut Sveidqvist
  *  MIT license.
  */
@@ -192,10 +192,10 @@ graphConfig
 ending: endToken ending
       | endToken
       ;
-      
+
 endToken: NEWLINE | SPACE | EOF;
-      
-FirstStmtSeperator 
+
+FirstStmtSeperator
     : SEMI | NEWLINE | spaceList NEWLINE ;
 
 
diff --git a/src/diagrams/gantt/parser/gantt.jison b/src/diagrams/gantt/parser/gantt.jison
index bc922378d..c972d41d4 100644
--- a/src/diagrams/gantt/parser/gantt.jison
+++ b/src/diagrams/gantt/parser/gantt.jison
@@ -1,5 +1,5 @@
 /** mermaid
- *  http://knsv.github.io/mermaid/
+ *  https://mermaidjs.github.io/
  *  (c) 2015 Knut Sveidqvist
  *  MIT license.
  */
@@ -59,4 +59,4 @@ statement
 	| taskTxt taskData {yy.addTask($1,$2);$$='task';}
 	;
 
-%%
\ No newline at end of file
+%%
diff --git a/src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison b/src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison
index 8a0f9a9e5..b77384360 100644
--- a/src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison
+++ b/src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison
@@ -1,5 +1,5 @@
 /** mermaid
- *  http://knsv.github.io/mermaid/
+ *  https://mermaidjs.github.io/
  *  (c) 2014-2015 Knut Sveidqvist
  *  MIT license.
  *