diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -535,6 +535,26 @@
   },
 
   "remote": {
+    "dependencies": [
+      "../include/functions/copy.h",
+      "../include/remote.h",
+      "../include/strarray.h",
+      "../include/repository.h",
+      "../include/transport.h"
+    ],
+
+    "functions": {
+      "git_remote_list": {
+        "ignore": false,
+        "isConstructorMethod": true,
+        "args": [
+          { "shouldAlloc": true }
+        ],
+        "return": {
+          "copy": "git_strarray_copy"
+        }
+      }
+    }
   },
 
   "repository": {
@@ -648,6 +668,10 @@
     "cType": null
   },
 
+  "strarray": {
+    "cType": "git_strarray"
+  },
+
   "submodule": {
   },
 

diff --git a/generate/templates/binding.gyp.ejs b/generate/templates/binding.gyp.ejs
@@ -23,7 +23,7 @@
       ],
 
       "cflags": [
-        "-Wall",
+        "-Wall"
       ],
 
       "conditions": [

diff --git a/generate/templates/convertToV8.cc.ejs b/generate/templates/convertToV8.cc.ejs
@@ -1,13 +1,16 @@
 <% toName = to.name || 'result' -%>
 <% if (to.cppClassName == "String") { -%>
-<% if (typeof to.size != 'undefined') { -%>
-  to = NanNew<String>(<%- toName %>, <%- to.size %>);
-<% } else { -%>
-  to = NanNew<String>(<%- toName %>);
-<% } -%>
-<% if (to.freeFunctionName) { -%>
-  <%- to.freeFunctionName %>(<%- toName %>);
-<% } -%>
+  <% if (typeof to.size != 'undefined') { -%>
+to = NanNew<String>(<%- toName %>, <%- to.size %>);
+  <% } else if (to.cType === "char **") { -%>
+to = NanNew<String>(*<%- toName %>);
+  <% } else { -%>
+to = NanNew<String>(<%- toName %>);
+  <% } -%>
+
+  <% if (to.freeFunctionName) { -%>
+    <%- to.freeFunctionName %>(<%- toName %>);
+  <% } -%>
 <% } else if (isV8Value(to.cppClassName)) { -%>
 <% if (~['Uint32', 'Int32'].indexOf(to.cppClassName)) { -%>
 <% var className = to.cppClassName.toLowerCase()+'_t' -%>

diff --git a/generate/types.json b/generate/types.json
@@ -1993,8 +1993,8 @@
     "js": "list"
   },
   "git_strarray *": {
-    "js": "Strarray",
-    "cpp": "Strarray"
+    "cpp": "GitStrarray",
+    "js": "Strarray"
   },
   "git_tag_list_match": {
     "cpp": "ListMatch",
@@ -2062,7 +2062,7 @@
   },
   "git_strarray*": {
     "js": "Strarray*",
-    "cpp": "Strarray*"
+    "cpp": "GitStrarray*"
   },
   "git_revparse_single": {
     "cpp": "RevparseSingle",
@@ -2213,8 +2213,8 @@
     "js": "strarrayCopy"
   },
   "const git_strarray *": {
-    "js": "Strarray",
-    "cpp": "Strarray"
+    "cpp": "GitStrarray",
+    "js": "Strarray"
   },
   "git_submodule_foreach": {
     "cpp": "Foreach",
@@ -9043,5 +9043,17 @@
   "const git_diff_line *": {
     "cpp": "GitDiffLine",
     "js": "DiffLine"
+  },
+  "git_strarray": {
+    "cpp": "GitStrarray",
+    "js": "Strarray"
+  },
+  "git_strarray **": {
+    "cpp": "GitStrarray",
+    "js": "Strarray"
+  },
+  "const git_strarray **": {
+    "cpp": "GitStrarray",
+    "js": "Strarray"
   }
 }
diff --git a/lib/remote.js b/lib/remote.js
@@ -0,0 +1,5 @@
+var NodeGit = require("../");
+
+var Remote = NodeGit.Remote;
+
+module.exports = Remote;
diff --git a/lib/repository.js b/lib/repository.js
@@ -5,6 +5,7 @@ var Tree = require("./tree");
 var Reference = require("./refs");
 var Revwalk = require("./revwalk");
 var Commit = require("./commit");
+var Remote = require("./remote");
 
 var TreeBuilder = NodeGit.Treebuilder;
 var Repository = NodeGit.Repository;
@@ -35,6 +36,22 @@ Repository.prototype.getBranch = function(name, callback) {
   }, callback);
 };
 
+/**
+ * Lists out the remotes in the given repository.
+ *
+ * @param {Function} Optional callback
+ * @return {Object} Promise object.
+ */
+Repository.prototype.getRemotes = function(callback) {
+  return Remote.list(this).then(function(remotes) {
+    if (typeof callback === "function") {
+      callback(null, remotes);
+    }
+
+    return remotes; 
+  }, callback);
+};
+
 /**
  * Lookup the reference with the given name.
  *

diff --git a/package.json b/package.json
@@ -72,6 +72,7 @@
     "test": "npm run lint && npm run mocha",
     "publish": "node-pre-gyp package && node-pre-gyp publish",
     "generate": "node generate/setup && node generate",
-    "install": "npm run generate && node install"
+    "install": "npm run generate && node install",
+    "rebuild": "npm run generate && node-gyp configure build"
   }
 }
diff --git a/test/tests/repository.js b/test/tests/repository.js
@@ -45,4 +45,11 @@ describe("Repository", function() {
       assert.ok(index instanceof Index);
     });
   });
+
+  it("can list remotes", function() {
+    return this.repository.getRemotes().then(function(remotes) {
+      assert.equal(remotes.count(), 1);
+      assert.equal(remotes.strings(), "origin");
+    });
+  });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ @@
           ],
           "cflags": [
-            "-Wall",
+            "-Wall"
           ],
           "conditions": [
@@ Expand Down @@