diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad8cbcf6..1d7ba5f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 3.6.0 / 2016-07-07
+
+  * Make callback optional
+  * Make callback use `process.nextTick`, so it's not sync
+
+  Thanks @STRML!
+
 ## 3.5.1 / 2016-06-29
 
   * Revert [#114](https://github.com/zemirco/json2csv/pull/114), due to more issues
diff --git a/package.json b/package.json
index 298da2c0..9fac7525 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "json2csv",
   "preferGlobal": "true",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Convert JSON to CSV",
   "keywords": [
     "json",