diff --git a/example/push.js b/example/push.js
@@ -0,0 +1,77 @@
+var nodegit = require('../');
+var path = require('path');
+var Promise = require('nodegit-promise');
+var promisify = require('promisify-node');
+var fse = promisify(require('fs-extra'));
+fse.ensureDir = promisify(fse.ensureDir);
+
+var fileName = 'newFile.txt';
+var fileContent = 'hello world';
+
+var repoDir = '../../newRepo';
+
+var repository;
+
+var signature = nodegit.Signature.create("Foo bar", "foo@bar.com", 123456789, 60);
+
+// Create a new repository in a clean directory, and add our first file
+fse.remove(path.resolve(__dirname, repoDir))
+.then(function() {
+  return fse.ensureDir(path.resolve(__dirname, repoDir));
+})
+.then(function() {
+  return nodegit.Repository.init(path.resolve(__dirname, repoDir), 0);
+})
+.then(function(repo) {
+  repository = repo;
+  return fse.writeFile(path.join(repository.workdir(), fileName), fileContent);
+})
+
+// Load up the repository index and make our initial commit to HEAD
+.then(function() {
+  return repository.openIndex();
+})
+.then(function(index) {
+  index.read(1);
+  index.addByPath(fileName);
+  index.write()
+
+  return index.writeTree();
+})
+.then(function(oid) {
+  return repository.createCommit('HEAD', signature, signature, 'initial commit', oid, []);
+})
+
+// Add a new remote
+.then(function() {
+  return nodegit.Remote.create(repository, "origin", "git@github.com:nodegit/push-example.git")
+  .then(function(remote) {
+    remote.connect(nodegit.Enums.DIRECTION.PUSH);
+
+    var push;
+
+    // We need to set the auth on the remote, not the push object
+    remote.setCallbacks({
+      credentials: function(url, userName) {
+        return nodegit.Cred.sshKeyFromAgent(userName);
+      }
+    });
+
+    // Create the push object for this remote
+    return nodegit.Push.create(remote)
+    .then(function(pushResult) {
+      push = pushResult;
+
+      // This just says what branch we're pushing onto what branch in the remote
+      return push.addRefspec("refs/heads/master:refs/heads/master");
+    }).then(function() {
+      // This is the call that performs the actual push
+      return push.finish();
+    }).then(function() {
+      // Check to see if the remote accepted our push request.
+      return push.unpackOk();
+    });
+  });
+}).done(function() {
+  console.log("Done!");
+})
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -946,8 +946,11 @@
     "push": {
       "cType": "git_push",
       "functions": {
-        "git_push_new": {
-          "ignore": true
+        "git_push_finish": {
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
         },
         "git_push_set_callbacks": {
           "ignore": true
@@ -1054,9 +1057,6 @@
         "git_remote_default_branch": {
           "ignore": true
         },
-        "git_remote_get_callbacks": {
-          "ignore": true
-        },
         "git_remote_get_fetch_refspecs": {
           "ignore": true
         },

diff --git a/generate/libgit2-supplement.json b/generate/libgit2-supplement.json
@@ -115,7 +115,22 @@
       [
         "git_direction",
         {
-          "type": "enum"
+          "type": "enum",
+          "description": "Enum to indicate the direction that a remote connection is going to go",
+          "fields": [
+            {
+              "type": "int",
+              "name": "GIT_DIRECTION_FETCH",
+              "comments": "Fetching from the remote repository",
+              "value": 0
+            },
+            {
+              "type": "int",
+              "name": "GIT_DIRECTION_PUSH",
+              "comments": "Pushing to a remote repository",
+              "value": 1
+            }
+          ]
         }
       ],
       [

diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -110,7 +110,7 @@ NAN_METHOD({{ cppClassName }}::New) {
   NanReturnValue(args.This());
 }
 
-Handle<Value> {{ cppClassName }}::New({{ cType }}* raw, bool selfFreeing) {
+Handle<Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {
   NanEscapableScope();
 
   Handle<Value> argv[2] = { NanNew<External>((void *)raw), NanNew<Boolean>(selfFreeing) };

diff --git a/generate/templates/struct_header.h b/generate/templates/struct_header.h
@@ -27,7 +27,7 @@ class {{ cppClassName }} : public ObjectWrap {
     {{ cType }} *GetValue();
     {{ cType }} **GetRefValue();
 
-    static Handle<Value> New({{ cType }} *raw, bool selfFreeing);
+    static Handle<Value> New(void *raw, bool selfFreeing);
 
     bool selfFreeing;
 

diff --git a/lib/remote.js b/lib/remote.js
@@ -1,5 +1,13 @@
 var NodeGit = require("../");
+var normalizeOptions = require("./util/normalize_options");
 
 var Remote = NodeGit.Remote;
+var setCallbacks = Remote.prototype.setCallbacks;
+
+Remote.prototype.setCallbacks = function(callbacks) {
+  callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
+
+  return setCallbacks.call(this, callbacks);
+};
 
 module.exports = Remote;
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -4,6 +4,7 @@ var path = require("path");
 describe("Remote", function() {
   var reposPath = path.resolve("test/repos/workdir/.git");
 
+  var NodeGit = require("../../");
   var Repository = require("../../lib/repository");
   var Remote = require("../../lib/remote");
 
@@ -92,7 +93,7 @@ describe("Remote", function() {
 
     return Remote.load(repo, "origin")
     .then(function(remote) {
-      remote.connect(0);
+      remote.connect(NodeGit.Enums.DIRECTION.FETCH);
       return remote.download();
     })
     .then(function() {