diff --git a/package.json b/package.json
index 2c61ebd..2e46206 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "name": "jpeg",
    "version": "1.0.0",
-   "main": "jpeg",
+   "main": "build/Release/jpeg",
    "description": "A C++ module for node-js that converts RGB and RGBA buffers to a JPEG images (in memory).",
    "keywords": [
        "jpg",
diff --git a/src/dynamic_jpeg_stack.cpp b/src/dynamic_jpeg_stack.cpp
index 9554ddb..949c248 100644
--- a/src/dynamic_jpeg_stack.cpp
+++ b/src/dynamic_jpeg_stack.cpp
@@ -377,7 +377,7 @@ DynamicJpegStack::SetQuality(const Arguments &args)
     return Undefined();
 }
 
-int
+void
 DynamicJpegStack::EIO_JpegEncode(eio_req *req)
 {
     encode_request *enc_req = (encode_request *)req->data;
@@ -392,7 +392,7 @@ DynamicJpegStack::EIO_JpegEncode(eio_req *req)
         enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
         if (!enc_req->jpeg) {
             enc_req->error = strdup("malloc in DynamicJpegStack::EIO_JpegEncode failed.");
-            return 0;
+            return;
         }
         else {
             memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len);
@@ -401,8 +401,6 @@ DynamicJpegStack::EIO_JpegEncode(eio_req *req)
     catch (const char *err) {
         enc_req->error = strdup(err);
     }
-
-    return 0;
 }
 
 int 
diff --git a/src/dynamic_jpeg_stack.h b/src/dynamic_jpeg_stack.h
index 0939344..dae3672 100644
--- a/src/dynamic_jpeg_stack.h
+++ b/src/dynamic_jpeg_stack.h
@@ -21,7 +21,7 @@ class DynamicJpegStack : public node::ObjectWrap {
 
     void update_optimal_dimension(int x, int y, int w, int h);
 
-    static int EIO_JpegEncode(eio_req *req);
+    static void EIO_JpegEncode(eio_req *req);
     static int EIO_JpegEncodeAfter(eio_req *req);
 public:
     DynamicJpegStack(buffer_type bbuf_type);
diff --git a/src/fixed_jpeg_stack.cpp b/src/fixed_jpeg_stack.cpp
index 4794914..56be937 100644
--- a/src/fixed_jpeg_stack.cpp
+++ b/src/fixed_jpeg_stack.cpp
@@ -247,7 +247,7 @@ FixedJpegStack::SetQuality(const Arguments &args)
     return Undefined();
 }
 
-int
+void
 FixedJpegStack::EIO_JpegEncode(eio_req *req)
 {
     encode_request *enc_req = (encode_request *)req->data;
@@ -260,7 +260,7 @@ FixedJpegStack::EIO_JpegEncode(eio_req *req)
         enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
         if (!enc_req->jpeg) {
             enc_req->error = strdup("malloc in FixedJpegStack::EIO_JpegEncode failed.");
-            return 0;
+            return;
         }
         else {
             memcpy(enc_req->jpeg, encoder.get_jpeg(), enc_req->jpeg_len);
@@ -269,8 +269,6 @@ FixedJpegStack::EIO_JpegEncode(eio_req *req)
     catch (const char *err) {
         enc_req->error = strdup(err);
     }
-
-    return 0;
 }
 
 int 
diff --git a/src/fixed_jpeg_stack.h b/src/fixed_jpeg_stack.h
index ab24109..849505a 100644
--- a/src/fixed_jpeg_stack.h
+++ b/src/fixed_jpeg_stack.h
@@ -13,7 +13,7 @@ class FixedJpegStack : public node::ObjectWrap {
 
     unsigned char *data;
 
-    static int EIO_JpegEncode(eio_req *req);
+    static void EIO_JpegEncode(eio_req *req);
     static int EIO_JpegEncodeAfter(eio_req *req);
 
 public:
diff --git a/src/jpeg.cpp b/src/jpeg.cpp
index 631d6fc..3231756 100644
--- a/src/jpeg.cpp
+++ b/src/jpeg.cpp
@@ -25,8 +25,8 @@ Jpeg::Initialize(v8::Handle<v8::Object> target)
     target->Set(String::NewSymbol("Jpeg"), t->GetFunction());
 }
 
-Jpeg::Jpeg(Buffer *ddata, int wwidth, int hheight, buffer_type bbuf_type) :
-    jpeg_encoder((unsigned char *)BufferData(ddata), wwidth, hheight, 60, bbuf_type) {}
+Jpeg::Jpeg(unsigned char *ddata, int wwidth, int hheight, buffer_type bbuf_type) :
+    jpeg_encoder(ddata, wwidth, hheight, 60, bbuf_type) {}
 
 Handle<Value>
 Jpeg::JpegEncodeSync()
@@ -42,7 +42,7 @@ Jpeg::JpegEncodeSync()
 
     int jpeg_len = jpeg_encoder.get_jpeg_len();
     Buffer *retbuf = Buffer::New(jpeg_len);
-    memcpy(BufferData(retbuf), jpeg_encoder.get_jpeg(), jpeg_len);
+    memcpy(Buffer::Data(retbuf), jpeg_encoder.get_jpeg(), jpeg_len);
     return scope.Close(retbuf->handle_); 
 }
 
@@ -98,8 +98,8 @@ Jpeg::New(const Arguments &args)
             return VException("Buffer type wasn't 'rgb', 'bgr', 'rgba' or 'bgra'.");
     }
 
-    Buffer *data_buf = ObjectWrap::Unwrap<Buffer>(args[0]->ToObject());
-    Jpeg *jpeg = new Jpeg(data_buf, w, h, buf_type);
+    Local<Object> buffer = args[0]->ToObject();
+    Jpeg *jpeg = new Jpeg((unsigned char*) Buffer::Data(buffer), w, h, buf_type);
     jpeg->Wrap(args.This());
     return args.This();
 }
@@ -137,7 +137,7 @@ Jpeg::SetQuality(const Arguments &args)
     return Undefined();
 }
 
-int
+void
 Jpeg::EIO_JpegEncode(eio_req *req)
 {
     encode_request *enc_req = (encode_request *)req->data;
@@ -149,7 +149,7 @@ Jpeg::EIO_JpegEncode(eio_req *req)
         enc_req->jpeg = (char *)malloc(sizeof(*enc_req->jpeg)*enc_req->jpeg_len);
         if (!enc_req->jpeg) {
             enc_req->error = strdup("malloc in Jpeg::EIO_JpegEncode failed.");
-            return 0;
+            return;
         }
         else {
             memcpy(enc_req->jpeg, jpeg->jpeg_encoder.get_jpeg(), enc_req->jpeg_len);
@@ -158,8 +158,6 @@ Jpeg::EIO_JpegEncode(eio_req *req)
     catch (const char *err) {
         enc_req->error = strdup(err);
     }
-
-    return 0;
 }
 
 int 
@@ -178,7 +176,7 @@ Jpeg::EIO_JpegEncodeAfter(eio_req *req)
     }
     else {
         Buffer *buf = Buffer::New(enc_req->jpeg_len);
-        memcpy(BufferData(buf), enc_req->jpeg, enc_req->jpeg_len);
+        memcpy(Buffer::Data(buf), enc_req->jpeg, enc_req->jpeg_len);
         argv[0] = buf->handle_;
         argv[1] = Undefined();
     }
diff --git a/src/jpeg.h b/src/jpeg.h
index e734c18..d371d00 100644
--- a/src/jpeg.h
+++ b/src/jpeg.h
@@ -9,11 +9,11 @@
 class Jpeg : public node::ObjectWrap {
     JpegEncoder jpeg_encoder;
 
-    static int EIO_JpegEncode(eio_req *req);
+    static void EIO_JpegEncode(eio_req *req);
     static int EIO_JpegEncodeAfter(eio_req *req);
 public:
     static void Initialize(v8::Handle<v8::Object> target);
-    Jpeg(node::Buffer *ddata, int wwidth, int hheight, buffer_type bbuf_type);
+    Jpeg(unsigned char *ddata, int wwidth, int hheight, buffer_type bbuf_type);
     v8::Handle<v8::Value> JpegEncodeSync();
     void SetQuality(int q);