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..b069e8f37 100644
--- a/node-uuid/node-uuid.d.ts
+++ b/node-uuid/node-uuid.d.ts
@@ -11,39 +11,43 @@ interface UUIDOptions {
      * Node id as Array of 6 bytes (per 4.1.6).
      * Default: Randomly generated ID. See note 1.
      */
-    node: any[]
+    node?: any[]
 
     /**
      * (Number between 0 - 0x3fff) RFC clock sequence.
      * Default: An internally maintained clockseq is used.
      */
-    clockseq: number
+    clockseq?: number
 
     /**
      * (Number | Date) Time in milliseconds since unix Epoch.
      * Default: The current time is used.
      */
-    msecs: any
+    msecs?: any
 
     /**
      * (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if msecs is unspecified.
      * Default: internal uuid counter is used, as per 4.2.1.2.
      */
-    nsecs: number
+    nsecs?: number
 }
 
 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