diff --git a/.travis/maven-build.sh b/.travis/maven-build.sh
new file mode 100644
index 0000000..d714368
--- /dev/null
+++ b/.travis/maven-build.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+    mvn -U package
+else
+    mvn -Dversion="$TRAVIS_COMMIT" -U package
+fi
\ No newline at end of file
diff --git a/deploy/deploy.bat b/deploy/deploy.bat
index 8ac3c64..e1f4c4f 100644
--- a/deploy/deploy.bat
+++ b/deploy/deploy.bat
@@ -2,3 +2,4 @@ mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.art
 
 :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
 :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
+:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.5 -Dpackaging=jar -Dfile=../target/final/Parabot-V2.5-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
diff --git a/pom.xml b/pom.xml
index 24cc3d4..4fcc000 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
 
     <properties>
         <jdk.version>1.7</jdk.version>
+        <build.version></build.version>
     </properties>
 
     <name>Parabot client</name>
@@ -75,7 +76,7 @@
     </dependencies>
 
     <build>
-        <finalName>Parabot-V${version}</finalName>
+        <finalName>Parabot-V${version}${build.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -84,14 +85,14 @@
             <resource>
                 <directory>deploy</directory>
                 <filtering>true</filtering>
-                <!--<excludes>-->
-                    <!--<exclude>deploy.bat</exclude>-->
-                    <!--<exclude>package.bat</exclude>-->
-                    <!--<exclude>clean.bat</exclude>-->
-                <!--</excludes>-->
-                <includes>
-                    <include>deploy.bat</include>
-                </includes>
+                <excludes>
+                    <exclude>deploy.bat</exclude>
+                    <exclude>package.bat</exclude>
+                    <exclude>clean.bat</exclude>
+                </excludes>
+                <!--<includes>-->
+                    <!--<include>deploy.bat</include>-->
+                <!--</includes>-->
             </resource>
         </resources>
 
@@ -120,7 +121,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>${version}</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -130,7 +131,7 @@
                             <mainClass>org.parabot.Landing</mainClass>
                         </manifest>
                     </archive>
-                    <outputDirectory>${project.build.directory}/final/</outputDirectory>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>