diff --git a/Packages/ohif-dicom-services/server/DIMSE/Message.js b/Packages/ohif-dicom-services/server/DIMSE/Message.js
index 472a95be1..7919a7e1a 100755
--- a/Packages/ohif-dicom-services/server/DIMSE/Message.js
+++ b/Packages/ohif-dicom-services/server/DIMSE/Message.js
@@ -282,7 +282,7 @@ DicomMessage.readMetaHeader = function(bufferOrFile, callback) {
                 return quitWithError('Cannot open file', callback);
             }
 
-            var buffer = new Buffer(16);
+            var buffer = Buffer.alloc(16);
             fs.read(fd, buffer, 0, 16, 128, function(err, bytesRead) {
                 if (err || bytesRead != 16) {
                     fs.closeSync(fd);
@@ -297,7 +297,7 @@ DicomMessage.readMetaHeader = function(bufferOrFile, callback) {
 
                 var el = readAElement(stream, useSyntax), 
                     metaLength = el.value,
-                    metaBuffer = new Buffer(metaLength);
+                    metaBuffer = Buffer.alloc(metaLength);
 
                 fs.read(fd, metaBuffer, 0, metaLength, 144, function(err, bytesRead) {
                     fs.closeSync(fd);
diff --git a/Packages/ohif-dicom-services/server/DIMSE/PDU.js b/Packages/ohif-dicom-services/server/DIMSE/PDU.js
index 653facc8c..027cdf06c 100755
--- a/Packages/ohif-dicom-services/server/DIMSE/PDU.js
+++ b/Packages/ohif-dicom-services/server/DIMSE/PDU.js
@@ -5,7 +5,7 @@ util.inherits(PDVHandle, EventEmitter);
 
 PDU = function() {
   this.fields = [];
-  this.lengthBytes = 4;  
+  this.lengthBytes = 4;
 }
 
 PDU.prototype.length = function(fields) {
@@ -27,7 +27,7 @@ PDU.prototype.getFields = function(fields) {
     fields.unshift(new ReservedField());
     fields.unshift(new HexField(this.type));
   }
-    
+
   return fields;
 }
 
@@ -39,7 +39,7 @@ PDU.prototype.lengthField = function(fields) {
   } else {
     throw "Invalid length bytes";
   }
-}  
+}
 
 PDU.prototype.read = function(stream) {
   stream.read(C.TYPE_HEX, 1);
@@ -55,7 +55,7 @@ PDU.prototype.loadPDV = function(stream, length) {
   if (stream.end()) return false;
   var bytesRead = 0, pdvs = [];
   while (bytesRead < length) {
-    var plength = stream.read(C.TYPE_UINT32), 
+    var plength = stream.read(C.TYPE_UINT32),
         pdv = new PresentationDataValueItem();
     pdv.readBytes(stream, plength);
     bytesRead += plength + 4;
@@ -72,7 +72,7 @@ PDU.prototype.loadDicomMessage = function(stream, isCommand, isLast) {
 }
 
 PDU.prototype.stream = function() {
-  var stream = new WriteStream(), 
+  var stream = new WriteStream(),
       fields = this.getFields();
 
   // writing to buffer
@@ -127,10 +127,10 @@ PDU.splitPData = function(pdata, maxSize) {
 }
 
 var readChunk = function(fd, bufferSize, slice, callback) {
-  var buffer = new Buffer(bufferSize), length = slice.length, start = slice.start;
+  var buffer = Buffer.alloc(bufferSize), length = slice.length, start = slice.start;
   fs.read(fd, buffer, 0, length, start, function(err, bytesRead) {
     callback(err, bytesRead, buffer, slice);
-  });  
+  });
 }
 
 PDU.generatePDatas = function(context, bufferOrFile, maxSize, length, metaLength, callback) {
@@ -151,7 +151,7 @@ PDU.generatePDatas = function(context, bufferOrFile, maxSize, length, metaLength
     if (total - start < maxSize) {
       sliceLength = total - start;
       isLast = true;
-    } 
+    }
     slices.push({start : start, length : sliceLength, isLast : isLast, index : index});
     start += sliceLength;
     index++;
@@ -191,11 +191,11 @@ PDU.generatePDatas = function(context, bufferOrFile, maxSize, length, metaLength
 
       var buffer = bufferOrFile.slice(toSlice.start, toSlice.length);
       var pdv = new RawDataPDV(context, buffer, 0, toSlice.length, toSlice.isLast);
-      handler.emit('pdv', pdv); 
+      handler.emit('pdv', pdv);
 
       if (i == slices.length - 1) {
         handler.emit('end');
-      }        
+      }
     }
   }
 
@@ -265,7 +265,7 @@ var nextItemIs = function(stream, pduType) {
 AssociateRQ = function() {
   PDU.call(this);
   this.type = C.ITEM_TYPE_PDU_ASSOCIATE_RQ;
-  this.protocolVersion = 1;  
+  this.protocolVersion = 1;
 }
 
 util.inherits(AssociateRQ, PDU);
@@ -325,7 +325,7 @@ AssociateRQ.prototype.readBytes = function(stream, length) {
   var callingAE = stream.read(C.TYPE_ASCII, 16);
   this.setCallingAETitle(callingAE);
   stream.increment(32);
-  
+
   var appContext = this.load(stream);
   this.setApplicationContextItem(appContext);
 
@@ -354,7 +354,7 @@ AssociateAC.prototype.readBytes = function(stream, length) {
   var version = stream.read(C.TYPE_UINT16);
   this.setProtocolVersion(version);
   stream.increment(66);
-  
+
   var appContext = this.load(stream);
   this.setApplicationContextItem(appContext);
 
@@ -384,7 +384,7 @@ AssociateAbort = function() {
   this.type = C.ITEM_TYPE_PDU_AABORT;
   this.source = 1;
   this.reason = 0;
-  PDU.call(this);  
+  PDU.call(this);
 }
 
 util.inherits(AssociateAbort, PDU);
@@ -409,7 +409,7 @@ AssociateAbort.prototype.readBytes = function(stream, length) {
 
 AssociateAbort.prototype.getFields = function() {
   return AssociateAbort.super_.prototype.getFields.call(this, [
-    new ReservedField(), new ReservedField(), 
+    new ReservedField(), new ReservedField(),
     new UInt8Field(this.source), new UInt8Field(this.reason)
   ]);
 }
@@ -480,7 +480,7 @@ Item.prototype.read = function(stream) {
   stream.read(C.TYPE_HEX, 1);
   var length = stream.read(C.TYPE_UINT16);
   this.readBytes(stream, length);
-}  
+}
 
 Item.prototype.write = function(stream) {
   stream.concat(this.stream());
@@ -541,7 +541,7 @@ PresentationDataValueItem.prototype.getFields = function() {
   fields.push(this.dataFragment);
 
   return PresentationDataValueItem.super_.prototype.getFields.call(this, fields);
-}  
+}
 
 RawDataPDV = function(context, buffer, start, length, isLast) {
   this.type = null;
@@ -568,7 +568,7 @@ RawDataPDV.prototype.getFields = function() {
 ApplicationContextItem = function() {
   this.type = C.ITEM_TYPE_APPLICATION_CONTEXT;
   this.applicationContextName = C.APPLICATION_CONTEXT_NAME;
-  Item.call(this);  
+  Item.call(this);
 }
 util.inherits(ApplicationContextItem, Item);
 
@@ -634,13 +634,13 @@ PresentationContextItem.prototype.readBytes = function(stream, length) {
 
 PresentationContextItem.prototype.getFields = function() {
   var f = [
-    new UInt8Field(this.presentationContextID), 
+    new UInt8Field(this.presentationContextID),
     new ReservedField(), new ReservedField(), new ReservedField(), this.abstractSyntaxItem
   ];
   this.transferSyntaxesItems.forEach(function(syntaxItem){
     f.push(syntaxItem);
   });
-  return PresentationContextItem.super_.prototype.getFields.call(this, f);  
+  return PresentationContextItem.super_.prototype.getFields.call(this, f);
 }
 
 PresentationContextItem.prototype.buffer = function() {
@@ -667,7 +667,7 @@ PresentationContextItemAC.prototype.readBytes = function(stream, length) {
 
 AbstractSyntaxItem = function() {
   this.type = C.ITEM_TYPE_ABSTRACT_CONTEXT;
-  Item.call(this);  
+  Item.call(this);
 }
 util.inherits(AbstractSyntaxItem, Item);
 
@@ -677,7 +677,7 @@ AbstractSyntaxItem.prototype.setAbstractSyntaxName = function(name) {
 
 AbstractSyntaxItem.prototype.getFields = function() {
   return AbstractSyntaxItem.super_.prototype.getFields.call(this, [new StringField(this.abstractSyntaxName)]);
-}  
+}
 
 AbstractSyntaxItem.prototype.buffer = function() {
   return AbstractSyntaxItem.super_.prototype.buffer.call(this);
@@ -744,7 +744,7 @@ UserInformationItem.prototype.buffer = function() {
 
 ImplementationClassUIDItem = function() {
   this.type = C.ITEM_TYPE_IMPLEMENTATION_UID;
-  Item.call(this);  
+  Item.call(this);
 }
 util.inherits(ImplementationClassUIDItem, Item);
 
@@ -767,7 +767,7 @@ ImplementationClassUIDItem.prototype.buffer = function() {
 
 ImplementationVersionNameItem = function() {
   this.type = C.ITEM_TYPE_IMPLEMENTATION_VERSION;
-  Item.call(this);  
+  Item.call(this);
 }
 util.inherits(ImplementationVersionNameItem, Item);
 
@@ -791,7 +791,7 @@ ImplementationVersionNameItem.prototype.buffer = function() {
 MaximumLengthItem = function() {
   this.type = C.ITEM_TYPE_MAXIMUM_LENGTH;
   this.maximumLengthReceived = 32768;
-  Item.call(this);  
+  Item.call(this);
 }
 util.inherits(MaximumLengthItem, Item);
 
diff --git a/Packages/ohif-dicom-services/server/DIMSE/RWStream.js b/Packages/ohif-dicom-services/server/DIMSE/RWStream.js
index 498372b82..618c7599f 100755
--- a/Packages/ohif-dicom-services/server/DIMSE/RWStream.js
+++ b/Packages/ohif-dicom-services/server/DIMSE/RWStream.js
@@ -18,7 +18,7 @@ calcLength = function(type, value) {
     case C.TYPE_DOUBLE : size = 8; break;
     case C.TYPE_INT8 : size = 1; break;
     case C.TYPE_INT16 : size = 2; break;
-    case C.TYPE_INT32 : size = 4; break;    
+    case C.TYPE_INT32 : size = 4; break;
     default :break;
 }
     return size;
@@ -28,7 +28,7 @@ var RWStream = function() {
     this.endian = C.BIG_ENDIAN;
 };
 
-RWStream.prototype.setEndian = function(endian) {   
+RWStream.prototype.setEndian = function(endian) {
     this.endian = endian;
 };
 
@@ -42,12 +42,12 @@ RWStream.prototype.getWriteType = function(type) {
 
 RWStream.prototype.getReadType = function(type) {
     return RWStream.reads[this.endian][type];
-};  
+};
 
 WriteStream = function() {
     RWStream.call(this);
     this.defaultBufferSize = 512; //512 bytes
-    this.rawBuffer = new Buffer(this.defaultBufferSize);
+    this.rawBuffer = Buffer.alloc(this.defaultBufferSize);
     this.offset = 0;
     this.contentSize = 0;
 };
@@ -72,8 +72,8 @@ WriteStream.prototype.skip = function(amount) {
 WriteStream.prototype.checkSize = function(length) {
     if (this.offset + length > this.rawBuffer.length) {
         // we need more size, copying old one to new buffer
-        var oldLength = this.rawBuffer.length, 
-            newBuffer = new Buffer(oldLength + length + (oldLength / 2));
+        var oldLength = this.rawBuffer.length,
+            newBuffer = Buffer.alloc(oldLength + length + (oldLength / 2));
         this.rawBuffer.copy(newBuffer, 0, 0, this.contentSize);
         this.rawBuffer = newBuffer;
     }
@@ -81,7 +81,7 @@ WriteStream.prototype.checkSize = function(length) {
 
 WriteStream.prototype.writeToBuffer = function(type, value, length) {
     if (value === '' || value === null) return;
-  
+
     this.checkSize(length);
     this.rawBuffer[this.getWriteType(type)](value, this.offset);
     this.increment(length);
@@ -138,7 +138,7 @@ ReadStream.prototype.size = function() {
 
 ReadStream.prototype.increment = function(add) {
     this.offset += add;
-};  
+};
 
 ReadStream.prototype.more = function(length) {
     var newBuf = this.rawBuffer.slice(this.offset, this.offset + length);
@@ -161,7 +161,7 @@ ReadStream.prototype.readFromBuffer = function(type, length) {
     var value = this.rawBuffer[this.getReadType(type)](this.offset);
     this.increment(length);
     return value;
-};  
+};
 
 ReadStream.prototype.read = function(type, length) {
     var value = null;
@@ -175,11 +175,11 @@ ReadStream.prototype.read = function(type, length) {
 };
 
 ReadStream.prototype.readString = function(length, type) {
-    var encoding = this.getEncoding(type), 
+    var encoding = this.getEncoding(type),
         str = this.rawBuffer.toString(encoding, this.offset, this.offset + length);
     this.increment(length);
     return str;
-};  
+};
 
 ReadStream.prototype.buffer = function() {
     return this.rawBuffer;
@@ -190,7 +190,7 @@ ReadStream.prototype.concat = function(newStream) {
     this.rawBuffer = Buffer.concat([this.buffer(), newStream.buffer()], newSize);
     this.contentSize = newSize;
     this.offset = newSize;
-};  
+};
 
 RWStream.writes = {};
 RWStream.writes[C.BIG_ENDIAN] = {};
@@ -209,7 +209,7 @@ RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT16] = 'writeUInt16LE';
 RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT32] = 'writeUInt32LE';
 RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT8] = 'writeInt8';
 RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT16] = 'writeInt16LE';
-RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT32] = 'writeInt32LE'; 
+RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT32] = 'writeInt32LE';
 RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_FLOAT] = 'writeFloatLE';
 RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_DOUBLE] = 'writeDoubleLE';