diff --git a/CHANGES.md b/CHANGES.md
index 4326978..5dcffa6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,5 @@
+## Nov 20, 2012
+* Change ? to +
 
 ## Mar 28, 2012
 
diff --git a/README.md b/README.md
index 48ac235..fff836d 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,17 @@
 Install
 =======
     
-    npm install JSONPath
+    npm install jsonpath-rep
 
 Evaluate
 ========
 
-    var jsonpath = require('JSONPath');
-    jsonpath.eval(obj, path);
+    var jsonpath = require('jsonpath-rep');
+    jsonpath.eval(obj, path, args);
 
-Or more concisely:
+With replacement
 
-	var jsonpath = require('JSONPath').eval;
-	jsonpath(obj, path);
+	  jsonpath.eval(obj, path, args, replaceval);
 
 Examples
 ========
@@ -63,8 +62,8 @@ XPath               | JSONPath               | Result
                     | $..book[-1:]           |
 //book[position()<3]| $..book[0,1]           | the first two books
                     | $..book[:2]            | 
-//book[isbn]        | $..book[?(@.isbn)]     | filter all books with isbn number
-//book[price<10]    | $..book[?(@.price<10)] | filter all books cheapier than 10
+//book[isbn]        | $..book[+(@.isbn)]     | filter all books with isbn number
+//book[price<10]    | $..book[+(@.price<10)] | filter all books cheapier than 10
 //*                 | $..*                   |all Elements in XML document. All members of JSON structure.
 
 
diff --git a/lib/jsonpath.js b/lib/jsonpath.js
index f7a7164..34ac64a 100644
--- a/lib/jsonpath.js
+++ b/lib/jsonpath.js
@@ -1,5 +1,6 @@
-/* JSONPath 0.8.0 - XPath for JSON
- *
+/* jsonpath-rep 0.0.1 - XPath for JSON with replacement
+ * Surat Teerapittayanon
+ * Modified from JSONPath 0.9.0 by
  * Copyright (c) 2007 Stefan Goessner (goessner.net)
  * Licensed under the MIT (MIT-LICENSE.txt) licence.
  */
@@ -8,126 +9,171 @@ var vm = require('vm'),
     _ = require('underscore');
 exports.eval = jsonPath;
 var cache = {};
-function jsonPath(obj, expr, arg) {
-   var P = {
-      resultType: arg && arg.resultType || "VALUE",
-      flatten: arg && arg.flatten || false,
-      wrap: (arg && arg.hasOwnProperty('wrap')) ? arg.wrap : true,
-      sandbox: (arg && arg.sandbox) ? arg.sandbox : {},
-      normalize: function(expr) {
-         if(cache[expr]) {
-            return cache[expr];
-         }
 
-         var subx = [];
-         ret = expr.replace(/[\['](\??\(.*?\))[\]']/g, function($0,$1){return "[#"+(subx.push($1)-1)+"]";})
-                    .replace(/'?\.'?|\['?/g, ";")
-                    .replace(/;;;|;;/g, ";..;")
-                    .replace(/;$|'?\]|'$/g, "")
-                    .replace(/#([0-9]+)/g, function($0,$1){return subx[$1];});
-         cache[expr] = ret;
-         return ret;
-      },
-      asPath: function(path) {
-         var x = path.split(";"), p = "$";
-         for (var i=1,n=x.length; i<n; i++)
-            p += /^[0-9*]+$/.test(x[i]) ? ("["+x[i]+"]") : ("['"+x[i]+"']");
-         return p;
-      },
-      store: function(p, v) {
-         if (p) {
-             if (P.resultType == "PATH") {
-                 P.result[P.result.length] = P.asPath(p);
-             }
-             else {
-                 if(_.isArray(v) && P.flatten) {
-                     if(!P.result) P.result = [];
-                     if(!_.isArray(P.result)) P.result = [P.result];
-                     P.result = P.result.concat(v);
-                 }
-                 else {
-                     if(P.result) {
-                         if(!_.isArray(P.result)) P.result = [P.result];
-                         if(_.isArray(v) && P.flatten) {
-                             P.result = P.result.concat(v);
-                         }
-                         else {
-                             P.result[P.result.length] = v;
-                         }
-                     }
-                     else {
-                         P.result = v;
-                     }
-                 }
-             }
-         }
-         return !!p;
-      },
-      trace: function(expr, val, path) {
-         if (expr) {
-            var x = expr.split(";"), loc = x.shift();
-            x = x.join(";");
-            if (val && val.hasOwnProperty(loc))
-               P.trace(x, val[loc], path + ";" + loc);
-            else if (loc === "*")
-               P.walk(loc, x, val, path, function(m,l,x,v,p) { P.trace(m+";"+x,v,p); });
-            else if (loc === "..") {
-               P.trace(x, val, path);
-               P.walk(loc, x, val, path, function(m,l,x,v,p) { typeof v[m] === "object" && P.trace("..;"+x,v[m],p+";"+m); });
+function jsonPath(obj, expr, arg, replace) {
+  var P = {
+    mod: (arg && arg.hasOwnProperty('mod')) ? arg.mod : true,
+    resultType: arg && arg.resultType || "VALUE",
+    flatten: arg && arg.flatten || false,
+    wrap: (arg && arg.hasOwnProperty('wrap')) ? arg.wrap : false,
+    sandbox: (arg && arg.sandbox) ? arg.sandbox : {},
+    normalize: function(expr) {
+      if (cache[expr]) {
+        return cache[expr];
+      }
+      var subx = [];
+      ret = expr.replace(/[\['](\+?\(.*?\))[\]']/g, function($0, $1) {
+        return "[#" + (subx.push($1) - 1) + "]";
+      }).replace(/'?\.'?|\['?/g, ";").replace(/;;;|;;/g, ";..;").replace(/;$|'?\]|'$/g, "").replace(/#([0-9]+)/g, function($0, $1) {
+        return subx[$1];
+      });
+      cache[expr] = ret;
+      return ret;
+    },
+    asPath: function(path) {
+      var x = path.split(";"),
+          p = "$";
+      for (var i = 1, n = x.length; i < n; i++)
+      p += /^[0-9*]+$/.test(x[i]) ? ("[" + x[i] + "]") : ("['" + x[i] + "']");
+      return p;
+    },
+    store: function(p, v, parent, idx) {
+      // console.log("store", v);
+      // console.log(obj);
+      if (replace) {
+        // console.log("replace");
+        parent[idx] = replace;
+      }
+      if (p) {
+        if (P.resultType == "PATH") {
+          P.result[P.result.length] = P.asPath(p);
+        } else {
+          if (_.isArray(v) && P.flatten) {
+            // console.log("out2");
+            if (!P.result) P.result = [];
+            if (!_.isArray(P.result)) P.result = [P.result];
+            P.result = P.result.concat(v);
+          } else {
+            // console.log("out3", P.result);
+            if (P.result) {
+              if (!_.isArray(P.result)) P.result = [P.result];
+              if (_.isArray(v) && P.flatten) {
+                P.result = P.result.concat(v);
+              } else {
+                // P.result[P.result.length] = v;
+                P.result = P.result.concat([v]);
+              }
+            } else {
+              P.result = v;
             }
-            else if (/,/.test(loc)) { // [name1,name2,...]
-               for (var s=loc.split(/'?,'?/),i=0,n=s.length; i<n; i++)
-                  P.trace(s[i]+";"+x, val, path);
+          }
+        }
+      }
+      // console.log(obj);
+      return !!p;
+    },
+    trace: function(expr, val, path, parent, idx) {
+      //console.log("expr",expr,"mod",P.mod);
+      if (expr) {
+        var x = expr.split(";"),
+            loc = x.shift(),
+            next = x[0];
+        x = x.join(";");
+        // console.log("val", val, loc, val.hasOwnProperty(loc));
+        if (val && val.hasOwnProperty(loc)) {
+          // console.log("hasOwn", val, loc);
+          P.trace(x, val[loc], path + ";" + loc, val, loc);
+        } else if (loc === "*") {
+          P.walk(loc, x, val, path, function(m, l, x, v, p) {
+            P.trace(m + ";" + x, v, p, parent, idx);
+          });
+        } else if (loc === "..") {
+          P.trace(x, val, path, parent, idx);
+          P.walk(loc, x, val, path, function(m, l, x, v, p) {
+            // console.log("recur",next, v,m);
+            // if (replace) {
+            //               if (next) {
+            //                 if (/^\d+$/.test(next)) {
+            //                   v[m] = [];
+            //                 } else {
+            //                   v[m] = {};
+            //                 }
+            //               }
+            //             }
+            typeof v[m] === "object" && P.trace("..;" + x, v[m], p + ";" + m, v, m);
+          });
+        } else if (/,/.test(loc)) { // [name1,name2,...]
+          for (var s = loc.split(/'?,'?/), i = 0, n = s.length; i < n; i++)
+          P.trace(s[i] + ";" + x, val, path, parent, idx);
+        } else if (/^\(.*?\)$/.test(loc)) { // [(expr)]
+          P.trace(P.eval(loc, val, path.substr(path.lastIndexOf(";") + 1)) + ";" + x, val, path, parent, idx);
+        } else if (/^\+\(.*?\)$/.test(loc)) { // [?(expr)]
+          P.walk(loc, x, val, path, function(m, l, x, v, p) {
+            if (P.eval(l.replace(/^\+\((.*?)\)$/, "$1"), v[m], m)) P.trace(m + ";" + x, v, p, parent, idx);
+          });
+        } else if (/^(-?[0-9]*):(-?[0-9]*):?([0-9]*)$/.test(loc)) { // [start:end:step]  phyton slice syntax
+          P.slice(loc, x, val, path, parent, idx);
+        } else if (replace && P.mod) {
+          // console.log("expr",expr);
+          // console.log("replace", val, loc, arguments, x);
+          // console.log("next",next);
+          if (next && !val[loc]) {
+            if (/^\d+$/.test(next)) {
+              // console.log("array");
+              val[loc] = [];
+            } else {
+              // console.log("object");
+              val[loc] = {};
             }
-            else if (/^\(.*?\)$/.test(loc)) // [(expr)]
-               P.trace(P.eval(loc, val, path.substr(path.lastIndexOf(";")+1))+";"+x, val, path);
-            else if (/^\?\(.*?\)$/.test(loc)) // [?(expr)]
-               P.walk(loc, x, val, path, function(m,l,x,v,p) { if (P.eval(l.replace(/^\?\((.*?)\)$/,"$1"),v[m],m)) P.trace(m+";"+x,v,p); });
-            else if (/^(-?[0-9]*):(-?[0-9]*):?([0-9]*)$/.test(loc)) // [start:end:step]  phyton slice syntax
-               P.slice(loc, x, val, path);
-         }
-         else
-            P.store(path, val);
-      },
-      walk: function(loc, expr, val, path, f) {
-         if (val instanceof Array) {
-            for (var i=0,n=val.length; i<n; i++)
-               if (i in val)
-                  f(i,loc,expr,val,path);
-         }
-         else if (typeof val === "object") {
-            for (var m in val)
-               if (val.hasOwnProperty(m))
-                  f(m,loc,expr,val,path);
-         }
-      },
-      slice: function(loc, expr, val, path) {
-         if (val instanceof Array) {
-            var len=val.length, start=0, end=len, step=1;
-            loc.replace(/^(-?[0-9]*):(-?[0-9]*):?(-?[0-9]*)$/g, function($0,$1,$2,$3){start=parseInt($1||start);end=parseInt($2||end);step=parseInt($3||step);});
-            start = (start < 0) ? Math.max(0,start+len) : Math.min(len,start);
-            end   = (end < 0)   ? Math.max(0,end+len)   : Math.min(len,end);
-            for (var i=start; i<end; i+=step)
-               P.trace(i+";"+expr, val, path);
-         }
-      },
-      eval: function(x, _v, _vname) {
-         P.sandbox["_v"] = _v;
-         try {
-             return $ && _v && vm.runInNewContext(x.replace(/@/g, "_v"), P.sandbox);
-         }
-         catch(e) {
-             console.log(e);
-             throw new SyntaxError("jsonPath: " + e.message + ": " + x.replace(/@/g, "_v").replace(/\^/g, "_a"));
-         }
+          }
+          P.trace(x, val[loc], path + ";" + loc, val, loc);
+        }
+      } else {
+        P.store(path, val, parent, idx);
       }
-   };
-   P.result = P.wrap === true ? [] : undefined;
-
-   var $ = obj;
-   if (expr && obj && (P.resultType == "VALUE" || P.resultType == "PATH")) {
-      P.trace(P.normalize(expr).replace(/^\$;/,""), obj, "$");
-      if(!_.isArray(P.result) && P.wrap) P.result = [P.result];
-      return P.result ? P.result : false;
-   }
-} 
+    },
+    walk: function(loc, expr, val, path, f) {
+      if (val instanceof Array) {
+        for (var i = 0, n = val.length; i < n; i++)
+        if (i in val) f(i, loc, expr, val, path);
+      } else if (typeof val === "object") {
+        for (var m in val)
+        if (val.hasOwnProperty(m)) f(m, loc, expr, val, path);
+      }
+    },
+    slice: function(loc, expr, val, path, parent, idx) {
+      if (val instanceof Array) {
+        var len = val.length,
+            start = 0,
+            end = len,
+            step = 1;
+        loc.replace(/^(-?[0-9]*):(-?[0-9]*):?(-?[0-9]*)$/g, function($0, $1, $2, $3) {
+          start = parseInt($1 || start);
+          end = parseInt($2 || end);
+          step = parseInt($3 || step);
+        });
+        start = (start < 0) ? Math.max(0, start + len) : Math.min(len, start);
+        end = (end < 0) ? Math.max(0, end + len) : Math.min(len, end);
+        for (var i = start; i < end; i += step)
+        P.trace(i + ";" + expr, val, path, parent, idx);
+      }
+    },
+    eval: function(x, _v, _vname) {
+      P.sandbox["_v"] = _v;
+      try {
+        return $ && _v && vm.runInNewContext(x.replace(/@/g, "_v"), P.sandbox);
+      } catch (e) {
+        console.log(e);
+        throw new SyntaxError("jsonPath: " + e.message + ": " + x.replace(/@/g, "_v").replace(/\^/g, "_a"));
+      }
+    }
+  };
+  P.result = P.wrap === true ? [] : undefined;
+  // console.log(P.wrap);
+  var $ = obj;
+  if (expr && obj && (P.resultType == "VALUE" || P.resultType == "PATH")) {
+    P.trace(P.normalize(expr).replace(/^\$;/, ""), obj, "$");
+    if (!_.isArray(P.result) && P.wrap) P.result = [P.result];
+    return P.result ? P.result : false;
+  }
+}
diff --git a/package.json b/package.json
index 92d9a92..a25978f 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,11 @@
 {
-    "author": "Stefan Goessner",
-    "name": "JSONPath",
-    "description": "A JS implementation of JSONPath",
+    "author": "Surat Teerapittayanon",
+    "name": "jsonpath-rep",
+    "description": "A JS implementation of JSONPath with replacement",
     "contributors": [
+        {
+            "name": "Stefan Goessner"
+        },
         {
             "name": "Prof. Gšssner",
             "email": "stefan.goessner@fh-dortmund.de"
@@ -16,10 +19,10 @@
             "email": "mike@brevoort.com"
         }
     ],
-    "version": "0.9.0",
+    "version": "0.0.1",
     "repository": {
         "type": "git",
-        "url": "git://github.com/s3u/JSONPath.git"
+        "url": "git://github.com/steerapi/JSONPath.git"
     },
     "main": "./lib/jsonpath",
     "dependencies": {
diff --git a/test/test.arr.js b/test/test.arr.js
index 9c891fc..95a1df3 100644
--- a/test/test.arr.js
+++ b/test/test.arr.js
@@ -1,36 +1,159 @@
 var jsonpath = require("../").eval,
     testCase = require('nodeunit').testCase
-
-var json = {
+    
+    
+    
+var json;
+initialize = function() {
+  json = {
     "store": {
-        "book": { "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": [8.95, 8.94, 8.93]
-        },
-        "books": [
-            { "category": "reference",
-                "author": "Nigel Rees",
-                "title": "Sayings of the Century",
-                "price": [8.95, 8.94, 8.93]
-            }
-        ]
+      "book": {
+        "category": "reference",
+        "author": "Nigel Rees",
+        "title": "Sayings of the Century",
+        "price": [8.95, 8.94, 8.93]
+      },
+      "books": [{
+        "category": "reference",
+        "author": "Nigel Rees",
+        "title": "Sayings of the Century",
+        "price": [8.95, 8.94, 8.93]
+      }]
     }
-};
-
+  };
+}
+initialize();
 
 module.exports = testCase({
-    "get single": function (test) {
-        var expected = json.store.book;
-        var result = jsonpath(json, "store.book", {flatten: true, wrap: false});
-        test.deepEqual(expected, result);
-        test.done();
-    },
+  //====================================
+  "get single": function(test) {
+    //====================================
+    var expected = json.store.book;
+    var result = jsonpath(json, "store.book", {
+      flatten: true,
+      wrap: false
+    });
+    test.deepEqual(expected, result);
+    test.done();
+  },
+  //====================================
+  "get arr": function(test) {
+    //====================================
+    var expected = json.store.books;
+    var result = jsonpath(json, "store.books", {
+      flatten: true,
+      wrap: false
+    });
+    test.deepEqual(expected, result);
+    test.done();
+  },
+  //====================================
+  "replace object property": function(test) {
+    //====================================
+    var expected = {
+      "store": {
+        "book": {
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [10, 20, 30]
+        },
+        "books": [{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [8.95, 8.94, 8.93]
+        }]
+      }
+    };
+    var result = jsonpath(json, "store.book", {
+      flatten: true,
+      wrap: false
+    }, {
+      "category": "reference",
+      "author": "Nigel Rees",
+      "title": "Sayings of the Century",
+      "price": [10, 20, 30]
+    });
+    test.deepEqual(expected, json);
+    test.done();
+  },
+  //====================================
+  "replace arr single": function(test) {
+    //====================================
+    initialize();
+    var expected = {
+      "store": {
+        "book": {
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [8.95, 8.94, 8.93]
+        },
+        "books": [{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [10, 20, 30]
+        }]
+      }
+    }
+    var result = jsonpath(json, "store.books[0]", {
+      flatten: true,
+      wrap: false
+    }, {
+      "category": "reference",
+      "author": "Nigel Rees",
+      "title": "Sayings of the Century",
+      "price": [10, 20, 30]
+    });
+    test.deepEqual(expected, json);
+    test.done();
+  },
+  //====================================
+  "replace arr multiple": function(test) {
+    //====================================
+    var json = {
+      "store": {
+        "books": [{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [8.95, 8.94, 8.93]
+        },{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [8.95, 8.94, 8.93]
+        }]
+      }
+    };
 
-    "get arr": function (test) {
-        var expected = json.store.books;
-        var result = jsonpath(json, "store.books", {flatten: true, wrap: false});
-        test.deepEqual(expected, result);
-        test.done();
+    var expected = {
+      "store": {
+        "books": [{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [10, 20, 30]
+        },{
+          "category": "reference",
+          "author": "Nigel Rees",
+          "title": "Sayings of the Century",
+          "price": [10, 20, 30]
+        }]
+      }
     }
+    var result = jsonpath(json, "store.books[*]", {
+      flatten: true,
+      wrap: false
+    }, {
+      "category": "reference",
+      "author": "Nigel Rees",
+      "title": "Sayings of the Century",
+      "price": [10, 20, 30]
+    });
+    test.deepEqual(expected, json);
+    test.done();
+  }
 });
diff --git a/test/test.at_and_dollar.js b/test/test.at_and_dollar.js
index e99d7db..592d824 100644
--- a/test/test.at_and_dollar.js
+++ b/test/test.at_and_dollar.js
@@ -37,14 +37,14 @@ module.exports = testCase({
     // ============================================================================    
     "test $ and @": function(test) {
     // ============================================================================    
-        test.expect(7);
-        test.equal(t1["$"],   jsonpath(t1, "\$")[0]);
-        test.equal(t1["$"],   jsonpath(t1, "$")[0]);
-        test.equal(t1["a$a"], jsonpath(t1, "a$a")[0]);
-        test.equal(t1["@"],   jsonpath(t1, "\@")[0]);
-        test.equal(t1["@"],   jsonpath(t1, "@")[0]);
-        test.equal(t1["$"]["@"], jsonpath(t1, "$.$.@")[0]);
-        test.equal(undefined, jsonpath(t1, "\@")[1]);
+        test.expect(6);
+        test.equal(t1["$"],   jsonpath(t1, "\$"));
+        test.equal(t1["$"],   jsonpath(t1, "$"));
+        test.equal(t1["a$a"], jsonpath(t1, "a$a"));
+        test.equal(t1["@"],   jsonpath(t1, "\@"));
+        test.equal(t1["@"],   jsonpath(t1, "@"));
+        test.equal(t1["$"]["@"], jsonpath(t1, "$.$.@"));
+        // test.equal(undefined, jsonpath(t1, "\@")[1]);
         
         test.done();
     }
diff --git a/test/test.examples.js b/test/test.examples.js
index 0532725..e568bfc 100644
--- a/test/test.examples.js
+++ b/test/test.examples.js
@@ -66,7 +66,7 @@ module.exports = testCase({
     "all sub properties, single level": function(test) {
     // ============================================================================    
         test.expect(1);
-        var expected = [json.store.book, json.store.bicycle];
+        var expected = json.store.book.concat(json.store.bicycle);
         var result = jsonpath(json, "$.store.*");
         test.deepEqual(expected, result);
         
@@ -79,7 +79,7 @@ module.exports = testCase({
         test.expect(1);
         var books = json.store.book;
         var expected = [books[0].price, books[1].price, books[2].price, books[3].price, json.store.bicycle.price];
-        var result = jsonpath(json, "$.store..price");
+        var result = jsonpath(json, "$.store..price",{wrap:true});
         test.deepEqual(expected, result);
         
         test.done();
@@ -90,7 +90,7 @@ module.exports = testCase({
     // ============================================================================    
         test.expect(1);
         var books = json.store.book;
-        var expected = [books[2]];
+        var expected = books[2];
         var result = jsonpath(json, "$..book[2]");
         test.deepEqual(expected, result);
         
@@ -102,7 +102,7 @@ module.exports = testCase({
     // ============================================================================    
         test.expect(2);
         var books = json.store.book;
-        var expected = [books[3]];
+        var expected = books[3];
         var result = jsonpath(json, "$..book[(@.length-1)]");
         test.deepEqual(expected, result);
         
@@ -133,7 +133,7 @@ module.exports = testCase({
         test.expect(1);
         var books = json.store.book;
         var expected = [books[2], books[3]];
-        var result = jsonpath(json, "$..book[?(@.isbn)]"); 
+        var result = jsonpath(json, "$..book[+(@.isbn)]"); 
         test.deepEqual(expected, result);
         
         test.done();
@@ -145,7 +145,7 @@ module.exports = testCase({
         test.expect(1);
         var books = json.store.book;
         var expected = [books[0], books[2]];
-        var result = jsonpath(json, "$..book[?(@.price<10)]"); 
+        var result = jsonpath(json, "$..book[+(@.price<10)]"); 
         test.deepEqual(expected, result);
         
         test.done();