@@ -1,7 +1,7 @@
 package com.pubnub.api;
 
 import org.bouncycastle.util.SecureRandom;
-
+import org.json.me.*;
 
 public class Pubnub extends PubnubCore {
 
@@ -10,12 +10,16 @@ public Pubnub(String publish_key, String subscribe_key, String secret_key,
         super(publish_key, subscribe_key, secret_key, cipher_key, ssl_on);
     }
 
+    public Pubnub(String publish_key, String subscribe_key, String secret_key,
+                  String cipher_key, boolean ssl_on, String initialization_vector) {
+        super(publish_key, subscribe_key, secret_key, cipher_key, ssl_on, initialization_vector);
+    }
+
     public Pubnub(String publish_key, String subscribe_key, String secret_key,
                   boolean ssl_on) {
         super(publish_key, subscribe_key, secret_key, "", ssl_on);
     }
 
-
     public Pubnub(String publish_key, String subscribe_key) {
         super(publish_key, subscribe_key, "", "", false);
     }
 
@@ -11,6 +11,10 @@ public PubnubCrypto(String CIPHER_KEY) {
         super(CIPHER_KEY);
     }
 
+    public PubnubCrypto(String CIPHER_KEY, String IV) {
+        super(CIPHER_KEY, IV);
+    }
+
     /**
      * Sign Message
      *
 
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import org.json.me.*;
 
 public class PubnubUtil extends PubnubUtilCore {
 
@@ -122,5 +123,25 @@ public static boolean dontNeedEncoding(int ch) {
 
         return en;
     }
+
+    /**
+     * Convert input String to JSONObject, JSONArray, or String
+     *
+     * @param str
+     *            JSON data in string format
+     *
+     * @return JSONArray or JSONObject or String
+     */
+    static Object stringToJSON(String str) {
+        try {
+            return new JSONArray(str);
+        } catch (JSONException e) {
+        }
+        try {
+            return new JSONObject(str);
+        } catch (JSONException ex) {
+        }
+        return str;
+    }
     private static String _dontNeedEncoding = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ -_.*";
 }
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Fri Jul 05 09:15:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-05">
+<META NAME="date" CONTENT="2013-07-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ public PubnubCrypto(String CIPHER_KEY) {`
`11`	`11`	`super(CIPHER_KEY);`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ public PubnubCrypto(String CIPHER_KEY, String IV) {`
	`15`	`+ super(CIPHER_KEY, IV);`
	`16`	`+ }`
	`17`	`+`
`14`	`18`	`/**`
`15`	`19`	`* Sign Message`
`16`	`20`	`*`