diff --git a/lib/modules/http-auth.js b/lib/modules/http-auth.js
index 779551a..eb319cd 100644
--- a/lib/modules/http-auth.js
+++ b/lib/modules/http-auth.js
@@ -90,7 +90,7 @@ OnvifHttpAuth.prototype._createAuthReqHeaderValue = function(o) {
 };
 
 OnvifHttpAuth.prototype._createCnonce = function(digit) {
-	let nonce = new Buffer(digit);
+	let nonce = Buffer.alloc(digit);
 	for(let i=0; i<digit; i++){
 		nonce.writeUInt8(Math.floor(Math.random() * 256), i);
 	}
@@ -127,4 +127,4 @@ OnvifHttpAuth.prototype._parseAuthHeader = function(h) {
 	return o;
 };
 
-module.exports = new OnvifHttpAuth();
\ No newline at end of file
+module.exports = new OnvifHttpAuth();
diff --git a/lib/modules/soap.js b/lib/modules/soap.js
index 2622d87..8c9008c 100644
--- a/lib/modules/soap.js
+++ b/lib/modules/soap.js
@@ -107,7 +107,7 @@ OnvifSoap.prototype._request = function(oxaddr, soap) {
 				'Content-Length': Buffer.byteLength(soap)
 			}
 		};
-	
+
 		let req = mHttp.request(post_opts, (res) => {
 			res.setEncoding('utf8');
 			let xml = '';
@@ -154,20 +154,20 @@ OnvifSoap.prototype._request = function(oxaddr, soap) {
 				res = null;
 			});
 		});
-	
+
 		req.setTimeout(this.HTTP_TIMEOUT);
-	
+
 		req.on('timeout', () => {
 			req.abort();
 		});
-	
+
 		req.on('error', (error) => {
 			req.removeAllListeners('error');
 			req.removeAllListeners('timeout');
 			req = null;
 			reject(new Error('Network Error: ' + (error ? error.message : '')));
 		});
-	
+
 		req.write(soap, 'utf8');
 		req.end();
 	});
@@ -234,7 +234,7 @@ OnvifSoap.prototype._createSoapUserToken = function(diff, user, pass) {
 	let nonce_buffer = this._createNonce(16);
 	let nonce_base64 = nonce_buffer.toString('base64');
 	let shasum = mCrypto.createHash('sha1');
-	shasum.update(Buffer.concat([nonce_buffer, new Buffer(date), new Buffer(pass)]));
+	shasum.update(Buffer.concat([nonce_buffer, Buffer.from(date), Buffer.from(pass)]));
 	let digest = shasum.digest('base64');
 	let soap = '';
 	soap += '<Security s:mustUnderstand="1" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">';
@@ -249,7 +249,7 @@ OnvifSoap.prototype._createSoapUserToken = function(diff, user, pass) {
 };
 
 OnvifSoap.prototype._createNonce = function(digit) {
-	let nonce = new Buffer(digit);
+	let nonce = Buffer.alloc(digit);
 	for(let i=0; i<digit; i++){
 		nonce.writeUInt8(Math.floor(Math.random() * 256), i);
 	}
@@ -320,4 +320,4 @@ OnvifSoap.prototype._getTypeOfValue = function(value) {
 	}
 }
 
-module.exports = new OnvifSoap();
\ No newline at end of file
+module.exports = new OnvifSoap();