diff --git a/embedded-mysql/src/main/resources/platform-map.properties b/embedded-mysql/src/main/resources/platform-map.properties
index 19de8bc..e7feaed 100755
--- a/embedded-mysql/src/main/resources/platform-map.properties
+++ b/embedded-mysql/src/main/resources/platform-map.properties
@@ -71,4 +71,5 @@ Windows_NT_(unknown)-x86=Win-x86
 Windows_Server_2008-x86=Win-x86
 Windows_Vista-amd64=Win-x86
 Windows_2003-amd64=Win-x86
-Windows_2000-amd64=Win-x86
\ No newline at end of file
+Windows_2000-amd64=Win-x86
+Windows_10-amd64=Win-x86
\ No newline at end of file
diff --git a/junitBdd/src/it/basic-usage/pom.xml b/junitBdd/src/it/basic-usage/pom.xml
index 9bcbb23..6e4ae8c 100644
--- a/junitBdd/src/it/basic-usage/pom.xml
+++ b/junitBdd/src/it/basic-usage/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.uniknow.agiledev.junitBDD</groupId>
     <artifactId>basic-usage</artifactId>
-    <version>0.1.10-SNAPSHOT</version>
+    <version>0.1.15-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/maven-embedded-mysql/src/it/basic-usage/pom.xml b/maven-embedded-mysql/src/it/basic-usage/pom.xml
index 1f9a635..91e5ddf 100644
--- a/maven-embedded-mysql/src/it/basic-usage/pom.xml
+++ b/maven-embedded-mysql/src/it/basic-usage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.uniknow.agiledev</groupId>
         <artifactId>parent</artifactId>
-        <version>0.1.10-SNAPSHOT</version>
+        <version>0.1.15-SNAPSHOT</version>
     </parent>
 
     <groupId>org.uniknow.agiledev.support.maven-embedded-mysql</groupId>
diff --git a/tutorials/rest/pom.xml b/tutorials/rest/pom.xml
index aa8454b..fe2ccda 100644
--- a/tutorials/rest/pom.xml
+++ b/tutorials/rest/pom.xml
@@ -107,7 +107,7 @@
                     <apiSources>
                         <apiSource>
                             <locations>
-                                org.uniknow.agiledev.tutorial.rest.api.jaxrs.V1
+                                org.uniknow.agiledev.tutorial.rest.api.jaxrs
                             </locations>
                             <schemes>http</schemes>
                             <host>[HOST]</host>
@@ -129,7 +129,7 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>pre-site</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>generate</goal>
                         </goals>
diff --git a/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V1/BlogRestService.java b/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V1/BlogRestService.java
index 3ca91fb..18fa8e0 100644
--- a/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V1/BlogRestService.java
+++ b/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V1/BlogRestService.java
@@ -59,21 +59,21 @@ public interface BlogRestService {
 
     @GET
     @Path("/posts")
-    @ApiOperation("Returns all blog messages")
+    @ApiOperation("Returns all blog messages - version 1")
     List<Post> getPosts();
 
     @GET
     @Path("/post/{id}")
-    @ApiOperation("Returns specified blog message")
+    @ApiOperation("Returns specified blog message - version 1")
     Post getPost(@PathParam("id") int id);
 
     @POST
     @Path("/post")
-    @ApiOperation("Adds blog message")
+    @ApiOperation("Adds blog message - version 1")
     Response addPost(Post post);
 
     @DELETE
     @Path("/post/{id}")
-    @ApiOperation("Removes blog message")
+    @ApiOperation("Removes blog message - version 1")
     Response deletePost(@PathParam("id") int id);
 }
diff --git a/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V2/BlogRestService.java b/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V2/BlogRestService.java
index 1b4fe3c..cf030b1 100644
--- a/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V2/BlogRestService.java
+++ b/tutorials/rest/src/main/java/org/uniknow/agiledev/tutorial/rest/api/jaxrs/V2/BlogRestService.java
@@ -40,6 +40,7 @@
 package org.uniknow.agiledev.tutorial.rest.api.jaxrs.V2;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -59,17 +60,21 @@ public interface BlogRestService {
 
     @GET
     @Path("/posts")
+    @ApiOperation("Returns all blog messages - version 2")
     List<Post> getPosts();
 
     @GET
     @Path("/post/{id}")
+    @ApiOperation("Returns specified blog message - version 2")
     Post getPost(@PathParam("id") int id);
 
     @POST
     @Path("/post")
+    @ApiOperation("Adds blog message - version 2")
     Response addPost(Post post);
 
     @DELETE
     @Path("/post/{id}")
+    @ApiOperation("Removes blog message - version 2")
     Response deletePost(@PathParam("id") int id);
 }