diff --git a/README.md b/README.md
index ba14851ccb..0d56c333e1 100644
--- a/README.md
+++ b/README.md
@@ -61,13 +61,20 @@ Or Bootstrap 4
 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" rel="stylesheet">
 ```
 To enable bootstrap 4 theme templates in ngx-bootstrap, please read
-[here](https://github.com/valor-software/ngx-bootstrap/blob/development/docs/getting-started/bootstrap4.md) .
+[this](https://github.com/valor-software/ngx-bootstrap/blob/development/docs/getting-started/bootstrap4.md) .
 
-```
-<!-- index.html -->
-<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-```
+# Usage & Demo
 
+Main source of API documentation and usage scenarios available here:
+[https://valor-software.com/ngx-bootstrap/](https://valor-software.com/ngx-bootstrap/)
+
+Additionally you can find demos and docs deployed from latest code with <a href="https://ngx-bootstrap.surge.sh/">angular v4</a> and <a
+  href="https://ngx-bootstrap-latest.surge.sh/">angular v5</a>
+
+Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a>
+
+# API
+Check demo page for API [reference](https://valor-software.com/ngx-bootstrap/)
 
 ## How to use it with:
  - `angular-cli` please refer to [getting-started-with-ng-cli](https://github.com/valor-software/ngx-bootstrap/tree/development/docs/getting-started/ng-cli.md)
@@ -94,15 +101,6 @@ First time
   If you want to run the demo with Angular Universal:
   - `npm run demo.serve-universal`
 
-
-# Usage & Demo
-
-Main source of API documentation and usage scenarios available here:
-[http://valor-software.github.io/ngx-bootstrap/](http://valor-software.github.io/ngx-bootstrap/)
-
-# API
-Check demo page for API [reference](http://valor-software.github.io/ngx-bootstrap/)
-
 # Troubleshooting
 
 So you are in trouble, where to get help:
diff --git a/demo/src/app/common/getting-started/getting-started.component.html b/demo/src/app/common/getting-started/getting-started.component.html
index 948bd1985c..486cd9cb17 100644
--- a/demo/src/app/common/getting-started/getting-started.component.html
+++ b/demo/src/app/common/getting-started/getting-started.component.html
@@ -93,12 +93,15 @@ <h3>How to use it with:</h3>
 
       <h2 id="usage--demo">Usage & Demo </h2>
 
-      <p>Main source of API documentation and usage scenarious available here:
-        <a href="http://valor-software.github.io/ngx-bootstrap/">http://valor-software.github.io/ngx-bootstrap/</a></p>
+      <p>Main source of API documentation and usage examples available here:
+        <a href="https://valor-software.com/ngx-bootstrap/">https://valor-software.com/ngx-bootstrap/</a></p>
+      <p>Additionally you can find demos and docs deployed from latest code with <a href="https://ngx-bootstrap.surge.sh/">angular v4</a> and <a
+        href="https://ngx-bootstrap-latest.surge.sh/">angular v5</a></p>
+      <p>Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a></p>
 
       <h2 id="api">API</h2>
 
-      <p>Check demo page for API <a href="http://valor-software.github.io/ngx-bootstrap/">reference</a></p>
+      <p>Check demo page for API <a href="https://valor-software.com/ngx-bootstrap/">reference</a></p>
 
       <h2 id="troubleshooting">Troubleshooting</h2>
 
diff --git a/docs/getting-started/bootstrap4.md b/docs/getting-started/bootstrap4.md
index 3c713259ec..bc222dd6f0 100644
--- a/docs/getting-started/bootstrap4.md
+++ b/docs/getting-started/bootstrap4.md
@@ -6,7 +6,7 @@ The important thing to note is the final section - you must let ngx-bootstrap kn
  
 #### Installing angular-cli
 
-*Important*: please check `angular-cli` version, it should be => "1.0.0-beta.24 (at the time or writing it is at 1.0.0-rc.0)"
+*Important*: please check `angular-cli` version, it should be => "1.5.0"
 
 *Note*: You can skip this part if you already have application generated by `ng-cli` and webpack.
   
@@ -83,19 +83,6 @@ In `styles.scss` add the following:
 @import '../node_modules/bootstrap/scss/bootstrap';
 ```
 
-### Let ngx-bootstrap know you are using Bootstrap 4
-
-Open `/src/index.html` and add the following markup:
-
-```html
-<body>
-  <!-- Enable bootstrap 4 theme -->
-  <script>window.__theme = 'bs4';</script>
-
-  <app-root>  </app-root>
-</body>
-```
-
 ### Testing
 
 Open `src/app/app.module.ts` and add