diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71d82c0..a42772d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### Fixed
 - Merge PR #120, fixing dependency issue with "@types/colors"
+- Merge PR #127, implementing "safer-buffer" polyfill to be compatible with older NodeJS versions
 
 ## [1.5.1] - 2018-03-12
 ### Added
diff --git a/package.json b/package.json
index 801f7d8..a176b83 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
     "js-yaml": "^3.7.0",
     "opn": "^5.2.0",
     "winston": "^2.4.0",
-    "source-map-support": "^0.5.0"
+    "source-map-support": "^0.5.0",
+    "safer-buffer": "^2.1.0"
   },
   "devDependencies": {
     "@types/chai": "^4.0.4",
diff --git a/src/util/polyfills.ts b/src/util/polyfills.ts
index 482d32f..4596b2f 100644
--- a/src/util/polyfills.ts
+++ b/src/util/polyfills.ts
@@ -1,3 +1,4 @@
 require('core-js/fn/string/raw');
 require('core-js/fn/object/assign');
-require('core-js/fn/array/entries');
\ No newline at end of file
+require('core-js/fn/array/entries');
+Buffer = require('safer-buffer').Buffer;