diff --git a/node-uuid/node-uuid-tests.ts b/node-uuid/node-uuid-tests.ts
index 9ad3c1cfc..e922c04de 100644
--- a/node-uuid/node-uuid-tests.ts
+++ b/node-uuid/node-uuid-tests.ts
@@ -23,7 +23,14 @@ var buf : number[] = []
 uuid.parse(uid4, buf, offset)
 uuid.unparse(buf, offset)
 
-uuid.v1(options, padding, offset)
-uuid.v2(options, padding, offset)
-uuid.v3(options, padding, offset)
-uuid.v4(options, padding, offset)
+var uid21: number[] = uuid.v1(options, padding, offset)
+var uid22: number[] = uuid.v2(options, padding, offset)
+var uid23: number[] = uuid.v3(options, padding, offset)
+var uid24: number[] = uuid.v4(options, padding, offset)
+
+var buffer: Buffer;
+
+var uid31: Buffer = uuid.v1(options, buffer, offset)
+var uid32: Buffer = uuid.v2(options, buffer, offset)
+var uid33: Buffer = uuid.v3(options, buffer, offset)
+var uid34: Buffer = uuid.v4(options, buffer, offset)
diff --git a/node-uuid/node-uuid.d.ts b/node-uuid/node-uuid.d.ts
index d1e1e8c2e..9a6368b10 100644
--- a/node-uuid/node-uuid.d.ts
+++ b/node-uuid/node-uuid.d.ts
@@ -33,17 +33,21 @@ interface UUIDOptions {
 }
 
 interface UUID {
-    v1(options?: UUIDOptions, buffer?: number[], offset?: number): string
-    v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): string
+    v1(options?: UUIDOptions): string
+    v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
+    v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
 
-    v2(options?: UUIDOptions, buffer?: number[], offset?: number): string
-    v2(options?: UUIDOptions, buffer?: Buffer, offset?: number): string
+    v2(options?: UUIDOptions): string
+    v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
+    v2(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
 
-    v3(options?: UUIDOptions, buffer?: number[], offset?: number): string
-    v3(options?: UUIDOptions, buffer?: Buffer, offset?: number): string
+    v3(options?: UUIDOptions): string
+    v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
+    v3(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
 
-    v4(options?: UUIDOptions, buffer?: number[], offset?: number): string
-    v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): string
+    v4(options?: UUIDOptions): string
+    v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
+    v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
 
     parse(id: string, buffer?: number[], offset?: number): number[]
     parse(id: string, buffer?: Buffer, offset?: number): Buffer