diff --git a/package.json b/package.json
index 52844dc..dfbb52f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "voucher-code-generator",
-    "version": "0.2.0",
+    "version": "0.2.1",
 
     "homepage": "http://www.voucherify.io/",
     "description": "Voucher Code Generator",
diff --git a/test/voucher_codes.spec.js b/test/voucher_codes.spec.js
index 5b1fb1a..43a4540 100644
--- a/test/voucher_codes.spec.js
+++ b/test/voucher_codes.spec.js
@@ -16,6 +16,13 @@ describe('voucher_codes', function(){
         expect(code.length).toBe(default_length);
     });
 
+    it('should generate code if no config provided', function(){
+        var default_length = 8;
+        var code = voucher_codes.generate()[0];
+
+        expect(code.length).toBe(default_length);
+    });
+
     it('should generate 5 unique codes', function(){
         var codes = voucher_codes.generate({
             length: 2,
@@ -75,7 +82,7 @@ describe('voucher_codes', function(){
         expect(code).toMatch(/-extra$/);
     });
 
-    it('should generate code with prefix', function(){
+    it('should generate code with prefix and postfix', function(){
         var code = voucher_codes.generate({
             prefix: "promo-",
             postfix: "-extra"
diff --git a/voucher_codes.js b/voucher_codes.js
index bb31202..9304056 100644
--- a/voucher_codes.js
+++ b/voucher_codes.js
@@ -33,6 +33,7 @@
     }
 
     function generate(config) {
+        config = config || {};
         var count = config.count || 1;
         var codes = {};
         while (count > 0) {