diff --git a/index.js b/index.js
index aba8fdd..e4e0635 100644
--- a/index.js
+++ b/index.js
@@ -1,2 +1,2 @@
 // For your convenience
-process.mixin(exports, require('./lib/csv'));
\ No newline at end of file
+module.exports = require('./lib/csv');
diff --git a/lib/csv.js b/lib/csv.js
index 48bfb7e..cbd205f 100644
--- a/lib/csv.js
+++ b/lib/csv.js
@@ -116,7 +116,7 @@ exports.each = function (filename, options) {
   var stream = new events.EventEmitter();
   
   var emit_row = function(row) {
-    var data = CSVToArray(row)[0]; 
+    var data = CSVToArray(row, strDelimiter)[0]; 
     if (options["headers"]) {
       if (headers == null) {
         headers = data;
@@ -181,13 +181,14 @@ exports.parse = function(str, options, data_listener) {
     throw new Exception("Data listener must be provided");
   }
   options = (options || {});
+  var strDelimiter = (options.strDelimiter || ",");
   var stream = new events.EventEmitter();
   stream.addListener("data", data_listener);
   var parts = str.split("\n");
   var pl = parts.length;
   var headers = null;
   for( var i = 0; i < pl; i++) { 
-    var data = CSVToArray(parts[i])[0]; 
+    var data = CSVToArray(parts[i], strDelimiter)[0]; 
     if (options["headers"]) {
       if (headers == null) {
         headers = data;