diff --git a/android/Pubnub-Android-3.5.4.jar b/android/Pubnub-Android-3.5.4.jar
index 7a12c436d..3dac4147a 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
new file mode 100644
index 000000000..10be50e33
Binary files /dev/null and b/android/Pubnub-Android-Debug-3.5.4.jar differ
diff --git a/android/build.xml b/android/build.xml
index 3ada937ad..54b09d0b9 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-Android-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-Android-Debug-${VERSION}.jar"/>
     <property name="java_core_path" value="../java"/>
     <property name="src_pubnub_api_path" value="${java_core_path}/srcPubnubApi"/>
     <property name="src_java_path" value="${java_core_path}/src1"/>
@@ -17,6 +18,7 @@
         <pathelement location="libs/android-8.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, clean, build" />
     <target name="setDebugTrue" >
         <replace dir="${src_pubnub_api_path}" token="boolean LOGGING = false" value="boolean LOGGING = true">
             <include name="**/*.java"/>
@@ -27,7 +29,6 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
     <target name="init">
         <mkdir dir="bin"/>
         <copy includeemptydirs="false" todir="bin">
@@ -39,17 +40,34 @@
     </target>
     <target name="clean">
         <delete dir="bin"/>
-        <delete file="${pubnub_lib_jar}"/>
     </target>
     <target depends="clean" name="cleanall"/>
-    <target depends="copy_jars_to_examples" name="build"/>
+    <target depends="copy_jars_to_examples" name="build-jar"/>
     <target depends="create-jar" name="copy_jars_to_examples">
         <copy file="${pubnub_lib_jar}" todir="./examples/PubnubExample/libs/"/>
         <copy file="${pubnub_lib_jar}" todir="./examples/SubscribeAtBoot/libs/"/>
     </target>
 
+
+    <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" depends="clean">
+        <delete file="${pubnub_debug_lib_jar}"/>
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
@@ -57,17 +75,17 @@
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${src_pubnub_api_path}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${src_pubnub_api_path}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${src_pubnub_api_path}"/>
             <src path="${src_java_path}"/>
             <src path="${src_logging_path}"/>
             <src path="${src_android_path}"/>
             <classpath refid="classpath"/>
         </javac>
-        <replace dir="${src_pubnub_api_path}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${src_pubnub_api_path}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>
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 7a12c436d..3dac4147a 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 7a12c436d..3dac4147a 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 5405b7c8d..8cda5af59 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
new file mode 100644
index 000000000..8abaccdff
Binary files /dev/null and b/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar differ
diff --git a/blackberry/build.xml b/blackberry/build.xml
index 5d23738a4..571cd4335 100644
--- a/blackberry/build.xml
+++ b/blackberry/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-BlackBerry-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-BlackBerry-Debug-${VERSION}.jar"/>
     <property name="srcPubnubApi.link" value="../java/srcPubnubApi"/>
     <property name="j2me.link" value="../j2me"/>
     <property name="target" value="1.1"/>
@@ -17,6 +18,7 @@
         <pathelement location="${j2me.link}/libs/tinylinegzip.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, build" />
     <target name="setJsonMeJar" >
         <replace dir="${srcPubnubApi.link}" token="org.json" value="org.json.me">
             <include name="**/*.java"/>
@@ -50,35 +52,48 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-jar, clean" 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" depends="clean" >
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+    <target depends="create-jar, clean" name="build-jar"/>
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
         <exec failonerror="true" executable="tools/preverify">
             <arg line="-classpath libs/net_rim_api.jar:libs/bouncycastle.jar:../j2me/libs/tinylinegzip.jar"/>
             <arg line="-d output"/>
-            <arg line="${pubnub_lib_jar}"/>
+            <arg line="${jar_name}"/>
         </exec>
-        <move verbose="true" file="output/${pubnub_lib_jar}" tofile="${pubnub_lib_jar}"/>
+        <move verbose="true" file="output/${jar_name}" tofile="${jar_name}"/>
         <delete dir="output"/>
     </target>
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${srcPubnubApi.link}"/>
             <src path="src"/>
             <src path="${j2me.link}/src1"/>
             <src path="${j2me.link}/srcLogging"/>
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>
diff --git a/build.xml b/build.xml
index 5cc52bb3c..2f435e105 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build">
+<project basedir="." default="build-all">
+    <target name="build-all">
+        <subant target="build-all" >
+            <fileset dir="." includes="*/build.xml" />
+        </subant>
+    </target>
     <target name="build">
         <subant target="build" >
             <fileset dir="." includes="*/build.xml" />
diff --git a/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib
new file mode 100644
index 000000000..bd61cc78b
Binary files /dev/null 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
new file mode 100644
index 000000000..7863a648e
Binary files /dev/null and b/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib differ
diff --git a/codenameone/PubnubClientSDK/build.xml b/codenameone/PubnubClientSDK/build.xml
index eb9af50d2..ea58875a3 100644
--- a/codenameone/PubnubClientSDK/build.xml
+++ b/codenameone/PubnubClientSDK/build.xml
@@ -2,10 +2,12 @@
     <!--build_version=1.3-->
     
     
-<project name="PubnubClientSDK" default="build" basedir=".">
+<project name="PubnubClientSDK" default="build-all" basedir=".">
     <description>Builds, tests, and runs the project PubnubClientSDK.</description>
     <import file="nbproject/build-impl.xml"/>
     <loadfile property="VERSION" srcFile="../../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
+    <property name="pubnub_cn1lib_file_name" value="../Pubnub-CodeNameOne-${VERSION}.cn1lib"/>
+    <property name="pubnub_debug_cn1lib_file_name" value="../Pubnub-CodeNameOne-Debug-${VERSION}.cn1lib"/>
     <property file="codenameone_settings.properties"/>
 
     <target name="create-src">
@@ -24,7 +26,7 @@
         <delete dir="src"/>
     </target>
     <target name="copy-lib">
-        <copy file="dist/PubnubClientSDK.cn1lib" tofile="../pubnub-codenameone-${VERSION}.cn1lib"/>
+        <copy file="dist/PubnubClientSDK.cn1lib" tofile="${jar_name}"/>
     </target>
 
     <target name="setDebugTrue" >
@@ -38,8 +40,19 @@
         </replace>
     </target>
 
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-src, default, delete-src, copy-lib, clean" name="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" depends="clean">
+        <delete file="${pubnub_cn1lib_file_name}"/>
+        <antcall target="build-lib">
+            <param name="jar_name" value="${pubnub_cn1lib_file_name}" />
+        </antcall>
+    </target>
+    <target depends="create-src, default, delete-src, copy-lib, clean" name="build-lib">
     </target>
     
     <target depends="init,compile,jar" name="compile-test">
@@ -105,94 +118,4 @@
         <zip basedir="build/lib" compress="true" destfile="dist/${application.title}.cn1lib" />
     </target>
 
-    <target name="buildNativeRIM">
-        <path id="rimNativeDir">
-            <fileset dir="native/rim"/>
-        </path> 
-        <property name="test.rimDir.property" refid="rimNativeDir"/> 
-        <condition property="doesntHaveRimFiles">
-            <equals arg1="" arg2="${test.rimDir.property}"/>
-        </condition> 
-
-        <antcall target="createRimZip" />        
-    </target>
-    
-    <target name="createRimZip"
-        unless="doesntHaveRimFiles">
-        <echo>Zipping rim native code</echo>
-        <zip basedir="native/rim" compress="false" destfile="build/lib/nativerim.zip" />
-    </target>
-
-    <target name="buildNativeAND">
-        <path id="andNativeDir">
-            <fileset dir="native/android"/>
-        </path> 
-        <property name="test.andDir.property" refid="andNativeDir"/> 
-        <condition property="doesntHaveAndFiles">
-            <equals arg1="" arg2="${test.andDir.property}"/>
-        </condition> 
-
-        <antcall target="createAndZip" />        
-    </target>
-    
-    <target name="createAndZip"
-        unless="doesntHaveAndFiles">
-        <echo>Zipping Android native code</echo>
-        <zip basedir="native/android" compress="false" destfile="build/lib/nativeand.zip" />
-    </target>
-
-    <target name="buildNativeWIN">
-        <path id="winNativeDir">
-            <fileset dir="native/win"/>
-        </path> 
-        <property name="test.winDir.property" refid="winNativeDir"/> 
-        <condition property="doesntHaveWinFiles">
-            <equals arg1="" arg2="${test.winDir.property}"/>
-        </condition> 
-
-        <antcall target="createWinZip" />        
-    </target>
-    
-    <target name="createWinZip"
-        unless="doesntHaveWinFiles">
-        <echo>Zipping win native code</echo>
-        <zip basedir="native/win" compress="false" destfile="build/lib/nativewin.zip" />
-    </target>
-
-    <target name="buildNativeIOS">
-        <path id="iosNativeDir">
-            <fileset dir="native/ios"/>
-        </path> 
-        <property name="test.iosDir.property" refid="iosNativeDir"/> 
-        <condition property="doesntHaveIosFiles">
-            <equals arg1="" arg2="${test.iosDir.property}"/>
-        </condition> 
-
-        <antcall target="createIosZip" />        
-    </target>
-    
-    <target name="createIosZip"
-        unless="doesntHaveIosFiles">
-        <echo>Zipping ios native code</echo>
-        <zip basedir="native/ios" compress="false" destfile="build/lib/nativeios.zip" />
-    </target>
-
-    <target name="buildNativeME">
-        <path id="meNativeDir">
-            <fileset dir="native/j2me"/>
-        </path> 
-        <property name="test.meDir.property" refid="meNativeDir"/> 
-        <condition property="doesntHaveMeFiles">
-            <equals arg1="" arg2="${test.meDir.property}"/>
-        </condition> 
-
-        <antcall target="createMeZip" />        
-    </target>
-    
-    <target name="createMeZip"
-        unless="doesntHaveMeFiles">
-        <echo>Zipping me native code</echo>
-        <zip basedir="native/j2me" compress="false" destfile="build/lib/nativeme.zip" />
-    </target>
-    
 </project>
diff --git a/codenameone/build.xml b/codenameone/build.xml
index 5cc52bb3c..f92a0c234 100644
--- a/codenameone/build.xml
+++ b/codenameone/build.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build">
+<project basedir="." default="build-all">
+    <target name="build-all">
+        <antcall target="build"/>
+        <antcall target="clean"/>
+        <antcall target="debug-build"/>
+    </target>
     <target name="build">
         <subant target="build" >
             <fileset dir="." includes="*/build.xml" />
diff --git a/codenameone/pubnub-codenameone-3.5.4.cn1lib b/codenameone/pubnub-codenameone-3.5.4.cn1lib
deleted file mode 100644
index 2c5ec08ce..000000000
Binary files a/codenameone/pubnub-codenameone-3.5.4.cn1lib and /dev/null differ
diff --git a/j2me/Pubnub-MicroEdition-3.5.4.jar b/j2me/Pubnub-MicroEdition-3.5.4.jar
index 1f9657394..2676a3628 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
new file mode 100644
index 000000000..9f533ab16
Binary files /dev/null and b/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar differ
diff --git a/j2me/build.xml b/j2me/build.xml
index 8ddb981f5..a8da65cff 100644
--- a/j2me/build.xml
+++ b/j2me/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-MicroEdition-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-MicroEdition-Debug-${VERSION}.jar"/>
     <property name="srcPubnubApi.link" value="../java/srcPubnubApi"/>
     <property name="target" value="1.1"/>
     <property name="source" value="1.3"/>
@@ -16,6 +17,7 @@
         <pathelement location="libs/tinylinegzip.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, build" />
     <target name="setJsonMeJar" >
         <replace dir="${srcPubnubApi.link}" token="org.json" value="org.json.me">
             <include name="**/*.java"/>
@@ -49,10 +51,25 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-jar, clean" 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" depends="clean">
+        <delete file="${pubnub_debug_lib_jar}"/>
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+    <target depends="create-jar, clean" name="build-jar"/>
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
@@ -60,17 +77,17 @@
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${srcPubnubApi.link}"/>
             <src path="src"/>
             <src path="src1"/>
             <src path="srcLogging"/>
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>
diff --git a/java/Pubnub-StandardEdition-3.5.4.jar b/java/Pubnub-StandardEdition-3.5.4.jar
index 63b99bf7f..2ad813769 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
new file mode 100644
index 000000000..1ce0b691b
Binary files /dev/null and b/java/Pubnub-StandardEdition-Debug-3.5.4.jar differ
diff --git a/java/build.xml b/java/build.xml
index 56996277e..13cdfb044 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project basedir="." default="build-all" name="PubnubApi" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property environment="env"/>
     <property name="pubnub_jar_file_name" value="Pubnub-StandardEdition-${VERSION}.jar"/>
+    <property name="pubnub_debug_jar_file_name" value="Pubnub-StandardEdition-Debug-${VERSION}.jar"/>
     <property name="pubnub_unittests_jar_file_name" value="Pubnub-UnitTests-${VERSION}.jar"/>
     <property name="srcPubnubApi.link" value="srcPubnubApi"/>
     <property name="sources_pubnub_api" value="${srcPubnubApi.link}/com/pubnub/api"/>
@@ -20,6 +21,7 @@
         <pathelement location="libs/junit-4.11.jar"/>
         <pathelement location="jars/Pubnub-UnitTests-${VERSION}.jar"/>
     </path>
+    <target name="build-all" depends="debug-build, build" />
     <path id="PubnubTests.classpath">
         <pathelement location="${pubnub_jar_file_name}"/>
         <pathelement location="libs/hamcrest-all-1.3.jar"/>
@@ -53,7 +55,6 @@
             </fileset>
         </copy>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
     <target name="clean_bin">
         <delete dir="bin"/>
     </target>
@@ -63,9 +64,26 @@
             <fileset dir="jars" includes="**/*.jar"/>
         </delete>
     </target>
-    <target depends="create-jar, create-test-jar, create-examples-jar, create-demo-console-jar, clean_bin, doc" 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" depends="clean">
+        <delete file="${pubnub_debug_jar_file_name}"/>
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_jar_file_name}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+
+    <target depends="create-jar, create-test-jar, create-examples-jar, create-demo-console-jar, clean_bin, doc" name="build-jar"/>
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_jar_file_name}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
             excludes="**/*Test*.class"
@@ -81,7 +99,7 @@
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
         <javac destdir="bin" debug="${debug}" source="${source}" target="${target}">
@@ -93,7 +111,7 @@
             <src path="examples/src"/>
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>
@@ -196,24 +214,21 @@
     <property name="maven-staging-repository-id" value="sonatype-nexus-staging" />
     <property name="maven-staging-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
 
-
-    <target name="maven_init">
-        <mkdir dir="${build}" />
-        <mkdir dir="${maven}/src/com/pubnub/api" />
-        <copy todir="${maven}/src/com/pubnub/api" >
-            <fileset dir="${sources_pubnub_java}" />
-            <fileset dir="${sources_pubnub_java1}" />
-            <fileset dir="${sources_pubnub_logging}" />
-            <fileset dir="${sources_pubnub_api}" />
-        </copy>
-        <mkdir dir="${dist}/lib" />
+    <target name="debug-compile" description="compile the source with logging and debug">
+        <replace dir="${maven}/src" token="boolean LOGGING = false" value="boolean LOGGING = true">
+            <include name="**/*.java"/>
+        </replace>
+        <javac debug="${debug}" srcdir="${maven}/src" destdir="${build}" >
+            <classpath refid="PubnubApi.classpath"/>
+        </javac>
+        <replace dir="${maven}/src" token="boolean LOGGING = true" value="boolean LOGGING = false">
+            <include name="**/*.java"/>
+        </replace>
     </target>
-
-    <target name="compile" depends="maven_init" description="compile the source ">
-        <javac srcdir="${maven}/src" destdir="${build}" >
+    <target name="compile" description="compile the source ">
+        <javac debug="${debug}" srcdir="${maven}/src" destdir="${build}" >
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-
     </target>
 
     <target name="dist" depends="compile" description="generate the distribution">
@@ -270,6 +285,43 @@
         <delete file="pom.xml.asc" />
     </target>
 
-    <target name="push_to_maven_central" depends="stage, maven_clean" />
+    <target name="push_to_maven_central" >
+        <mkdir dir="${build}" />
+        <mkdir dir="${maven}/src/com/pubnub/api" />
+        <copy todir="${maven}/src/com/pubnub/api" >
+            <fileset dir="${sources_pubnub_java}" />
+            <fileset dir="${sources_pubnub_java1}" />
+            <fileset dir="${sources_pubnub_logging}" />
+            <fileset dir="${sources_pubnub_api}" />
+        </copy>
+        <mkdir dir="${dist}/lib" />
+        <antcall target="stage"/>
+        <antcall target="maven_clean"/>
+    </target>
+
+    <target name="push_debug_to_maven_central" >
+        <mkdir dir="${build}" />
+        <mkdir dir="${maven}/src/com/pubnub/api" />
+        <copy todir="${maven}/src/com/pubnub/api" >
+            <fileset dir="${sources_pubnub_java}" />
+            <fileset dir="${sources_pubnub_java1}" />
+            <fileset dir="${sources_pubnub_logging}" />
+            <fileset dir="${sources_pubnub_api}" />
+        </copy>
+        <replace dir="${maven}/src" token="boolean LOGGING = false" value="boolean LOGGING = true">
+            <include name="**/*.java"/>
+        </replace>
+        <replace dir="." token="artifactId>pubnub" value="artifactId>pubnub-debug">
+            <include name="**/pom.xml"/>
+        </replace>
+        <mkdir dir="${dist}/lib" />
+        <antcall target="stage">
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="maven_clean"/>
+        <replace dir="." token="artifactId>pubnub-debug" value="artifactId>pubnub">
+            <include name="**/pom.xml"/>
+        </replace>
+    </target>
 
 </project>
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
index addbca06e..3d887ae93 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
index c6842bf11..fc314661d 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 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 0253c7e7e..50affa7f2 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 Fri Aug 23 22:55:23 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:05 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html
index 46307aa4c..3fbc4a1c1 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 Fri Aug 23 22:55:23 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:05 IST 2013 -->
 <TITLE>
 HttpUtil
 </TITLE>
diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
index 97b0f6d84..af51bd082 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 Fri Aug 23 22:55:23 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:05 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
index f5965ef14..9f8af82bb 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
index df5a461ad..f37047a1f 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
index d4206af78..3fbd44b16 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 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 d678e9398..c09ca73ec 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 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 b839f44cf..73eafc29a 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 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 5c28e0250..4152a25b4 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html
index a73aff8d6..4efc095e2 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html
index 2c8e92d71..b74c028bd 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html
index e23f40f07..3d5b86e8f 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
diff --git a/java/doc/index-all.html b/java/doc/index-all.html
index 48bea0f92..95e8de16d 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
diff --git a/java/doc/index.html b/java/doc/index.html
index 730531a8b..1f23fda1d 100644
--- a/java/doc/index.html
+++ b/java/doc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Fri Aug 23 22:55:24 IST 2013-->
+<!-- Generated by javadoc on Fri Aug 23 23:20:06 IST 2013-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>
diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html
index 873042cd7..21847a4b0 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html
index 24e8659c7..8d8195f6a 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 Fri Aug 23 22:55:24 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Fri Aug 23 23:20:06 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 21524646a..5afa9f6f4 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 3ab18b4b2..b9c27f3ad 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 0cf29f7d1..92251d79e 100644
Binary files a/java/jars/PubnubExample.jar and b/java/jars/PubnubExample.jar differ
diff --git a/java/src1/com/pubnub/api/HttpClientCore.java b/java/src1/com/pubnub/api/HttpClientCore.java
index 91a6badaa..9eb1f678d 100644
--- a/java/src1/com/pubnub/api/HttpClientCore.java
+++ b/java/src1/com/pubnub/api/HttpClientCore.java
@@ -86,6 +86,7 @@ public HttpResponse fetch(String url) throws PubnubException, SocketTimeoutExcep
     public synchronized HttpResponse fetch(String url, Hashtable headers)
     throws PubnubException, SocketTimeoutException {
         URL urlobj = null;
+        log.verbose("FETCHING URL : " + url);
         try {
             urlobj = new URL(url);
         } catch (MalformedURLException e3) {
@@ -120,20 +121,21 @@ public synchronized HttpResponse fetch(String url, Hashtable headers)
         connection.setReadTimeout(requestTimeout);
         connection.setConnectTimeout(connectionTimeout);
 
-
+        /*
         try {
             connection.connect();
         } catch (SocketTimeoutException  e) {
             throw e;
         } catch (IOException e) {
-            throw new PubnubException(getErrorObject(PNERROBJ_CONNECT_EXCEPTION, url));
+            throw new PubnubException(getErrorObject(PNERROBJ_CONNECT_EXCEPTION, url + " : " + e.toString()));
         }
+        */
 
-        int rc = HttpURLConnection.HTTP_CLIENT_TIMEOUT;
+        int rc = HttpURLConnection.HTTP_INTERNAL_ERROR;
         try {
             rc = connection.getResponseCode();
         } catch (IOException e) {
-            throw new PubnubException(getErrorObject(PNERROBJ_HTTP_RC_ERROR, url));
+            throw new PubnubException(getErrorObject(PNERROBJ_HTTP_RC_ERROR, url + " : " + e.toString()));
         }
 
 
@@ -166,6 +168,7 @@ public synchronized HttpResponse fetch(String url, Hashtable headers)
             throw new PubnubException(getErrorObject(PNERROBJ_READINPUT, url));
         }
 
+        log.verbose("URL = " + url + " : RESPONSE = " + page);
         switch (rc) {
         case HttpURLConnection.HTTP_FORBIDDEN:
             throw new PubnubException(getErrorObject(PNERROBJ_FORBIDDEN, page));
@@ -192,11 +195,10 @@ public synchronized HttpResponse fetch(String url, Hashtable headers)
         case HttpURLConnection.HTTP_GATEWAY_TIMEOUT:
             throw new PubnubException(getErrorObject(PNERROBJ_GATEWAY_TIMEOUT, url));
         case HttpURLConnection.HTTP_INTERNAL_ERROR:
-            throw new PubnubException(getErrorObject(PNERROBJ_INTERNAL_ERROR, url));
+            throw new PubnubException(getErrorObject(PNERROBJ_INTERNAL_ERROR, url + " : " + rc));
         default:
             break;
         }
-        log.verbose("URL = " + url + " : RESPONSE = " + page);
         return new HttpResponse(rc, page);
     }