diff --git a/android/Pubnub-Android-3.5.4.jar b/android/Pubnub-Android-3.5.4.jar
index dc3451798..10be50e33 100644
Binary files a/android/Pubnub-Android-3.5.4.jar and b/android/Pubnub-Android-3.5.4.jar differ
diff --git a/android/Pubnub-Android-Debug-3.5.4.jar b/android/Pubnub-Android-Debug-3.5.4.jar
index bea044062..10be50e33 100644
Binary files a/android/Pubnub-Android-Debug-3.5.4.jar and b/android/Pubnub-Android-Debug-3.5.4.jar differ
diff --git a/android/build.xml b/android/build.xml
index d85db51e0..54b09d0b9 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -49,14 +49,14 @@
     </target>
 
 
-    <target name="build">
+    <target name="build" depends="clean">
         <delete file="${pubnub_lib_jar}"/>
         <antcall target="build-jar">
             <param name="jar_name" value="${pubnub_lib_jar}" />
             <param name="debug" value="false" />
         </antcall>
     </target>
-    <target name="debug-build">
+    <target name="debug-build" depends="clean">
         <delete file="${pubnub_debug_lib_jar}"/>
         <antcall target="setDebugTrue" />
         <antcall target="build-jar">
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar
index dc3451798..10be50e33 100644
Binary files a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar and b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar differ
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar
index dc3451798..10be50e33 100644
Binary files a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar and b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar differ
diff --git a/blackberry/Pubnub-BlackBerry-3.5.4.jar b/blackberry/Pubnub-BlackBerry-3.5.4.jar
index af3f78235..23dc9a36d 100644
Binary files a/blackberry/Pubnub-BlackBerry-3.5.4.jar and b/blackberry/Pubnub-BlackBerry-3.5.4.jar differ
diff --git a/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar b/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar
index 3a214b609..8abaccdff 100644
Binary files a/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar and b/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar differ
diff --git a/blackberry/build.xml b/blackberry/build.xml
index 613b295e3..571cd4335 100644
--- a/blackberry/build.xml
+++ b/blackberry/build.xml
@@ -52,13 +52,13 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target name="build">
+    <target name="build" depends="clean" >
         <antcall target="build-jar">
             <param name="jar_name" value="${pubnub_lib_jar}" />
             <param name="debug" value="false" />
         </antcall>
     </target>
-    <target name="debug-build">
+    <target name="debug-build" depends="clean" >
         <antcall target="setDebugTrue" />
         <antcall target="build-jar">
             <param name="jar_name" value="${pubnub_debug_lib_jar}" />
diff --git a/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib
index 8ad225c33..6362b522e 100644
Binary files a/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib and b/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib differ
diff --git a/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib
index 762975477..7863a648e 100644
Binary files a/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib and b/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib differ
diff --git a/codenameone/PubnubClientSDK/build.xml b/codenameone/PubnubClientSDK/build.xml
index 41ce2be21..ea58875a3 100644
--- a/codenameone/PubnubClientSDK/build.xml
+++ b/codenameone/PubnubClientSDK/build.xml
@@ -40,13 +40,13 @@
         </replace>
     </target>
 
-    <target name="debug-build">
+    <target name="debug-build" depends="clean">
         <delete file="${pubnub_debug_cn1lib_file_name}"/>
         <antcall target="build-lib">
             <param name="jar_name" value="${pubnub_debug_cn1lib_file_name}" />
         </antcall>
     </target>
-    <target name="build">
+    <target name="build" depends="clean">
         <delete file="${pubnub_cn1lib_file_name}"/>
         <antcall target="build-lib">
             <param name="jar_name" value="${pubnub_cn1lib_file_name}" />
diff --git a/j2me/Pubnub-MicroEdition-3.5.4.jar b/j2me/Pubnub-MicroEdition-3.5.4.jar
index 082efd360..962b369e8 100644
Binary files a/j2me/Pubnub-MicroEdition-3.5.4.jar and b/j2me/Pubnub-MicroEdition-3.5.4.jar differ
diff --git a/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar b/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar
index fee8f80d3..9f533ab16 100644
Binary files a/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar and b/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar differ
diff --git a/j2me/build.xml b/j2me/build.xml
index 92fec3687..a8da65cff 100644
--- a/j2me/build.xml
+++ b/j2me/build.xml
@@ -51,14 +51,14 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target name="build">
+    <target name="build" depends="clean">
         <delete file="${pubnub_lib_jar}"/>
         <antcall target="build-jar">
             <param name="jar_name" value="${pubnub_lib_jar}" />
             <param name="debug" value="false" />
         </antcall>
     </target>
-    <target name="debug-build">
+    <target name="debug-build" depends="clean">
         <delete file="${pubnub_debug_lib_jar}"/>
         <antcall target="setDebugTrue" />
         <antcall target="build-jar">
diff --git a/java/Pubnub-StandardEdition-3.5.4.jar b/java/Pubnub-StandardEdition-3.5.4.jar
index 74679c122..6e1e09b80 100644
Binary files a/java/Pubnub-StandardEdition-3.5.4.jar and b/java/Pubnub-StandardEdition-3.5.4.jar differ
diff --git a/java/Pubnub-StandardEdition-Debug-3.5.4.jar b/java/Pubnub-StandardEdition-Debug-3.5.4.jar
index 0ef521d40..1ce0b691b 100644
Binary files a/java/Pubnub-StandardEdition-Debug-3.5.4.jar and b/java/Pubnub-StandardEdition-Debug-3.5.4.jar differ
diff --git a/java/build.xml b/java/build.xml
index 362172006..13cdfb044 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -64,14 +64,14 @@
             <fileset dir="jars" includes="**/*.jar"/>
         </delete>
     </target>
-    <target name="build">
+    <target name="build" depends="clean">
         <delete file="${pubnub_jar_file_name}"/>
         <antcall target="build-jar">
             <param name="jar_name" value="${pubnub_jar_file_name}" />
             <param name="debug" value="false" />
         </antcall>
     </target>
-    <target name="debug-build">
+    <target name="debug-build" depends="clean">
         <delete file="${pubnub_debug_jar_file_name}"/>
         <antcall target="setDebugTrue" />
         <antcall target="build-jar">
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
index 04aad4f56..e2e220f46 100644
--- a/java/doc/allclasses-frame.html
+++ b/java/doc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
index 30b2448c5..deec5984f 100644
--- a/java/doc/allclasses-noframe.html
+++ b/java/doc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
index 08dd241bc..9ed2eb1c3 100644
--- a/java/doc/com/pubnub/api/Callback.html
+++ b/java/doc/com/pubnub/api/Callback.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:30 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:55 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html
index c3e8c9058..31ee28c7a 100644
--- a/java/doc/com/pubnub/api/HttpUtil.html
+++ b/java/doc/com/pubnub/api/HttpUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:30 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:55 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>
diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
index d11ced251..878dfa809 100644
--- a/java/doc/com/pubnub/api/Pubnub.html
+++ b/java/doc/com/pubnub/api/Pubnub.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:30 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:55 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
index 4a93839fd..23f716f5d 100644
--- a/java/doc/com/pubnub/api/PubnubError.html
+++ b/java/doc/com/pubnub/api/PubnubError.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
index 6827e6240..0b45e280b 100644
--- a/java/doc/com/pubnub/api/PubnubException.html
+++ b/java/doc/com/pubnub/api/PubnubException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
index b4c9dc4cc..57a5bc127 100644
--- a/java/doc/com/pubnub/api/PubnubUtil.html
+++ b/java/doc/com/pubnub/api/PubnubUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html
index a09c998c5..a5b5f3722 100644
--- a/java/doc/com/pubnub/api/package-frame.html
+++ b/java/doc/com/pubnub/api/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html
index 40eb51fb7..43c4a3332 100644
--- a/java/doc/com/pubnub/api/package-summary.html
+++ b/java/doc/com/pubnub/api/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html
index 7dc64e735..5bd22e406 100644
--- a/java/doc/com/pubnub/api/package-tree.html
+++ b/java/doc/com/pubnub/api/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html
index de61af2e3..dda21af80 100644
--- a/java/doc/constant-values.html
+++ b/java/doc/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html
index fed78e849..569754dde 100644
--- a/java/doc/deprecated-list.html
+++ b/java/doc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html
index 9dc26ff42..b9b21748e 100644
--- a/java/doc/help-doc.html
+++ b/java/doc/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
diff --git a/java/doc/index-all.html b/java/doc/index-all.html
index 09b79f36a..44236fc63 100644
--- a/java/doc/index-all.html
+++ b/java/doc/index-all.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
diff --git a/java/doc/index.html b/java/doc/index.html
index e7d4e2781..91e3f5003 100644
--- a/java/doc/index.html
+++ b/java/doc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Mon Jul 15 15:16:31 IST 2013-->
+<!-- Generated by javadoc on Mon Jul 15 20:50:56 IST 2013-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>
diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html
index cbc9774e9..9b708dd75 100644
--- a/java/doc/overview-tree.html
+++ b/java/doc/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html
index d3f298270..6faf98818 100644
--- a/java/doc/serialized-form.html
+++ b/java/doc/serialized-form.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 15:16:31 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 15 20:50:56 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
diff --git a/java/jars/Pubnub-UnitTests-3.5.4.jar b/java/jars/Pubnub-UnitTests-3.5.4.jar
index a4a8169e5..3d161a09d 100644
Binary files a/java/jars/Pubnub-UnitTests-3.5.4.jar and b/java/jars/Pubnub-UnitTests-3.5.4.jar differ
diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar
index a147bc234..07d432813 100644
Binary files a/java/jars/PubnubDemoConsole.jar and b/java/jars/PubnubDemoConsole.jar differ
diff --git a/java/jars/PubnubExample.jar b/java/jars/PubnubExample.jar
index 4e0230d3b..8d2e98265 100644
Binary files a/java/jars/PubnubExample.jar and b/java/jars/PubnubExample.jar differ