diff --git a/.gitignore b/.gitignore
index 86d943a9b2e8f3bb69fbe37fd8363962646b1d92..70cd8d2905c548c5523a0f787fb5865476cddfbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+# Documentation
+documentation/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a200c1bca52aa5b97ee3fc221529fa5ff860162..20500e89951fba1347627fbdb076c7d302cd8b5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,44 @@ before_script:
     - gem install dpl
 
 stages:
+    - doc
     - staging
     - production
 
+doc:
+    stage: doc
+    before_script:
+        ##
+        ## Install ssh-agent if not already installed, it is required by Docker.
+        ## (change apt-get to yum if you use an RPM-based image)
+        ##
+        - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+        ##
+        ## Run ssh-agent (inside the build environment)
+        ##
+        - eval $(ssh-agent -s)
+
+        ##
+        ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+        ## We're using tr to fix line endings which makes ed25519 keys work
+        ## without extra base64 encoding.
+        ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556
+        ##
+        - echo "$DOC_SSH_KEY" | tr -d '\r' | ssh-add -
+
+        ##
+        ## Create the SSH directory and give it the right permissions
+        ##
+        - mkdir -p ~/.ssh
+        - chmod 700 ~/.ssh 
+
+    script: 
+        - npm install -g @compodoc/compodoc
+        - npx @compodoc/compodoc -p tsconfig.json
+        - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r ./documentation/* "$DOC_SSH_USER"@"$DOC_SERVER":/var/www/html
+        
+
 staging:
     type: deploy
     stage: staging
diff --git a/README.md b/README.md
index 4873a020f97d86669c5c98ed2987cefa8dee1308..b7d42098d80010c249b3799e40791f19578ffe12 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# Versusvirus2020
+# YANA.help initially developed at Versusvirus2020
+
+![YANA logo](https://www.yana.help/assets/yana-tree-noHands.svg)
 
 ## Contributing workflow
 1. After having cloned this repository use `ng serve -o` to test locally (n.b: you might need a local Google Maps API key for some functionalities ask maintainers).
@@ -9,10 +11,12 @@
    git checkout -b "name-of-your-branch" "origin/name-of-your-branch"
    ```
 4. Implement your feature or fix the bug and commit your changes.
-5. Pull the latest changes from the master repository. (Resolve conflicts if necessary. In doubt ask maintainers)
-6. Push the changes to your merge request branch. Remove "WIP" from title and assign a maintainer to review and merge your code.
-7. If everything is fine your code will be merged to the staging branch where we can review the edits on http://test.yana.help.
-8. Finally the maintainers will take care of merging all changes from staging onto master so that they can integrate the main site.
+5. Check the open issue to make sure your merge request satisfies requirements
+6. Document and run `npx @compodoc/compodoc -p tsconfig.json` if you want to see the updated documentation locally before merging. Further information https://compodoc.app/guides/getting-started.html
+7. Pull the latest changes from the master repository. (Resolve conflicts if necessary. In doubt ask maintainers)
+8. Push the changes to your merge request branch. Remove "WIP" from title and assign a maintainer to review and merge your code.
+9. If everything is fine your code will be merged to the staging branch where we can review the edits on http://test.yana.help.
+10. Finally the maintainers will take care of merging all changes from staging onto master so that they can integrate the main site.
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.4.
 
diff --git a/src/app/maps/maps.component.html b/src/app/maps/maps.component.html
index 9f59c7f4f70ab429663c06a602c4f1f9d8c7090a..bfee0ff76741e2fb376f9f877547195f9550197e 100644
--- a/src/app/maps/maps.component.html
+++ b/src/app/maps/maps.component.html
@@ -26,14 +26,13 @@
               <span *ngIf="place.address !== ''" >{{ place.address }}</span><br/>
               <span *ngIf="place.postalCode != 0" >{{ place.postalCode }}</span><br/>
               <span *ngIf="place.city !== ''" >{{ place.city }}</span><br/>
-              <a *ngIf="place.website !== ''" href="http://{{place.website}}" target="_blank" translate>MAP.WEBSITE</a><br/>
+              <a *ngIf="place.website !== ''" href="{{place.website}}" target="_blank" translate>MAP.WEBSITE</a><br/>
               <a *ngIf="place.tel !== ''" href="tel://+{{place.tel.replace(' ', '')}}" target="_blank">{{ place.tel }}</a><br/>
               <span class="target" *ngIf="place.type !== ''">{{ 'MAP.WHO' | translate }} : {{ place.type }}</span><br/>
           </agm-info-window>
       </agm-marker>
-    </agm-map>
-  </div>
-
+  </agm-map>
+</div>
   <div class="details-container">
     <div *ngFor='let t of typeMap | keyvalue' class="content-box">
       <div *ngIf='t.key != ""' class="content-header"><p>{{t.key}}</p></div>