diff --git a/CITATION b/CITATION
new file mode 100644
index 0000000..8fb7ef5
--- /dev/null
+++ b/CITATION
@@ -0,0 +1,22 @@
+cff-version: 1.0.3
+message: If you use this software, please cite it as below.
+authors:
+  - family-names: Masson
+    given-names: Antoine
+    orcid: https://orcid.org/0000-0002-7993-5698
+    affiliation: Ecole Polytechnique Fédérale de Lausanne, Library
+    email: antoine.masson@epfl.ch
+title: Cost Calculator
+version: beta 2.1
+doi: 10.5281/zenodo.1469035
+date-released: 2018-10-08
+repository-code: https://c4science.ch/source/costcalc/repository/master/
+url: https://rdmepfl.github.io/costcalc/
+keywords: 
+    - research data
+    - storage
+    - cost estimate
+    - planning
+abstract: A dynamic online tool for calculating the cost of research data storage services. It's highly modular and can be adapted for all kind of application. The system is really easy to install as it uses only opensource javascript libraries.
+license: GPL-3.0-only
+
diff --git a/CODEMETA.json b/CODEMETA.json
new file mode 100644
index 0000000..5a4327a
--- /dev/null
+++ b/CODEMETA.json
@@ -0,0 +1,24 @@
+{
+    "@context": "https://doi.org/10.5063/SCHEMA/CODEMETA-1.0",
+    "@type": "Code",
+    "author": [
+        {
+            "@type": "Person",
+			"name": "Antoine Masson",
+			"@id": "https://orcid.org/0000-0002-7993-5698",
+			"affiliation": "Ecole Polytechnique Fédérale de Lausanne, Library",
+            "email": "antoine.masson@epfl.ch"
+        }
+    ],
+	"name": "Cost Calculator",
+	"softwareVersion": "beta 2.1",
+	"identifier": "10.5281/zenodo.1469035",
+    "datePublished": "2018-10-08",
+    "codeRepository": "https://c4science.ch/source/costcalc/repository/master/",
+	"URL": "https://rdmepfl.github.io/costcalc/",
+	"programmingLanguage": "javascript",
+    "keywords": "research data, storage, cost estimate, planning",
+    "description": "A dynamic online tool for calculating the cost of research data storage services. It's highly modular and can be adapted for all kind of application. The system is really easy to install as it uses only opensource javascript libraries.",
+    "license": "GPL-3.0-only"
+}
+
diff --git a/README.md b/README.md
index 8345bc0..e9168e1 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,24 @@
 # Cost Calculator
 
 ## Introduction
 
 Cost calculator is an online project for calculating cost of services. It's originaly designed for helping researcher for estimating the cost of managing data.
 
 ## How to use it
 
 The structure is higly modulable and can be extended for different projects. All the information are stored on javascript and the system only uses javascript librairies making really easy to install and update.
 
 ## Documentation
 
 The documentation of the project explains how to install it and configure it.
 
 ## Citation
 The project is hosted on Zenodo : [![DOI](https://zenodo.org/badge/152056755.svg)](https://zenodo.org/badge/latestdoi/152056755)
 
-The citation informations are here **TBD**
+The citation informations are in the __CITATION__ file and __CODEMETA.json__.
 
 ## License and Term of Usage
 
-This project is release under GNuv3 license see (LICENSE)[https://github.com/rdmepfl/costcalc/blob/master/LICENSE].
+This project is release under GNuv3 license see __LICENSE__.
 
-It's a work of the Research Data Management Team at EPFL Switzerland.
+It's a work of the Research Data Management Team at EPFL Library in Switzerland.