diff --git a/README.md b/README.md
index ffb9d1f81b..ffa1b9f642 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,15 @@
 
 [Eclipse Leshan™](https://eclipse.org/leshan) is an OMA Lightweight M2M server and client Java implementation.
 
-[What is OMA LWM2M ?](http://technical.openmobilealliance.org/Technical/release_program/lightweightM2M_v1_0.aspx)  
-[The specification](http://openmobilealliance.org/release/LightweightM2M/V1_0-20170208-A/OMA-TS-LightweightM2M-V1_0-20170208-A.pdf).  
+[What is OMA LWM2M ?](http://www.openmobilealliance.org/wp/overviews/lightweightm2m_overview.html)  
+[The specification](http://openmobilealliance.org/release/LightweightM2M/V1_0_1-20170704-A/OMA-TS-LightweightM2M-V1_0_1-20170704-A.pdf).  
 [Object and Resource Registry](http://www.openmobilealliance.org/wp/OMNA/LwM2M/LwM2MRegistry.html).  
 
 Leshan provides libraries which help people to develop their own Lightweight M2M server and client.  
 The project also provides a client, a server and a bootstrap server demonstration as an example of the Leshan API and for testing purpose.
 
+[Here](https://github.com/eclipse/leshan/wiki/LWM2M-Supported-features) you can see which part of the specification is currently covered by Leshan.
+
 Contact
 -------
 
@@ -30,7 +32,7 @@ You can try live our servers demos instances:
 
 (Automatic deployment of master branch)
 
-Test Leshan locally
+Test Leshan Demos locally
 -----------------------
 Get and run the last binary of our demo **server** :
 ```
@@ -48,8 +50,18 @@ wget https://hudson.eclipse.org/leshan/job/leshan/lastSuccessfulBuild/artifact/l
 java -jar ./leshan-bsserver-demo.jar
 ```
 
-Compile & Run
+Compile Leshan & Run Demos
 -------------
+Get sources :
+```bash
+#using ssh
+git clone git@github.com:eclipse/leshan.git
+#using https
+git clone https://github.com/eclipse/leshan.git
+
+```
+
+Compile it, by running in leshan root folder :
 
 ```
 mvn clean install
@@ -61,14 +73,13 @@ java -jar leshan-server-demo/target/leshan-server-demo-*-SNAPSHOT-jar-with-depen
 ```
 
 Connect on Leshan demo UI: http://localhost:8080  
-Leshan provides a very simple UI to get the list of connected clients and interact with clients resources.
+Leshan server Demo provides a very simple UI to get the list of connected clients and interact with clients resources.
 
 Now you can register a LWM2M client by running our **client** demo:
 ```
 java -jar leshan-client-demo/target/leshan-client-demo-*-SNAPSHOT-jar-with-dependencies.jar 
 ```
-or trying the [Eclipse Wakaama](http://eclipse.org/wakaama) test client or script samples of its lua binding [lualwm2m] (https://github.com/sbernard31/lualwm2m).
-
+or trying the [Eclipse Wakaama](http://eclipse.org/wakaama) test client.
 
 You can also try our **bootstrap** demo server:
 ```