diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..0e8da73
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,69 @@
+<!--
+IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATING
+-->
+
+**I'm submitting a ...**  (check one with "x")
+
+### Problem
+ - ( ) bug report => please search github for a similar issue or PR before submitting
+ - ( ) unexpected behavior => please visit the Wiki before
+ 
+ **Current behavior**
+ <!-- Describe how the bug or problem manifests. -->
+ 
+ **Expected behavior**
+ <!-- Describe what the behavior would be without the bug or problem. -->
+ 
+ **Minimal reproduction of the problem with instructions**
+ <!--
+ If the current behavior is a bug or you can illustrate your feature request better with an example, 
+ please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO FLOW* for Node-RED of the problem.
+ -->
+   1. 
+   2. 
+   3. 
+   
+ ## Feature
+ - ( ) feature request
+ 
+ **What is the motivation / use case for changing the behavior?**
+ <!-- Describe the motivation or the concrete use case -->
+ 
+ 
+ ## Support
+ - support request => **Please do not submit support requests here**, instead see use [the link to our support page](https://bianco-royal.cloud/supporter/#/content/backer)
+ - ( ) simple question => please visit the Wiki and Info tab by clicking on the node inside Node-RED before
+
+## Your Environment
+**Please tell us about your environment:**
+<!-- system, BACnet server or client type, package manager, equipment, vendor info -->
+
+
+  * ( ) I am using just the Node-RED package and got node-bacstack installed with it
+  * ( ) I have installed node-bacstack global from source (using git clone)
+  * ( ) I have installed node-bacstack as a global package (using npm i -g)
+        
+  * Device :
+    
+    - ( ) macOS: v 
+    - ( ) Linux: v 
+    - ( ) Windows: v 
+    - ( ) Raspbian: v 
+    - ( ) Other:
+         - Name:
+         - Version:
+   
+   * Description of the connecting BACnet system:
+   
+     - Name   :
+     - Version:
+     - Vendor :
+     - Link   : https://
+     
+    
+* **node-red-contrib-bacnet version:** ``
+<!-- Check which is the hash of the last commit from node-red-contrib-bacnet that you have locally -->
+
+* **Node:** (min. 6.10.x)
+   `node --version` =
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35333ff..a97a774 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,3 @@
-# Change Log
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
 <a name="0.0.16"></a>
 ## [0.0.16](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.15...v0.0.16) (2018-04-23)
 
@@ -11,59 +7,19 @@ All notable changes to this project will be documented in this file. See [standa
 ## [0.0.15](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.14...v0.0.15) (2018-04-23)
 
 
+### Bug Fixes
 
-<a name="0.0.14"></a>
-## [0.0.14](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.9...v0.0.14) (2018-02-19)
-
-
-
-<a name="0.0.9"></a>
-## [0.0.9](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.8...v0.0.9) (2017-12-09)
-
-
-
-<a name="0.0.8"></a>
-## [0.0.8](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.7...v0.0.8) (2017-12-09)
-
-
-
-<a name="0.0.7"></a>
-## [0.0.7](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.6...v0.0.7) (2017-12-09)
-
+* **write:** IP address missing via payload ([e1a3ef1](https://github.com/biancode/node-red-contrib-bacnet/commit/e1a3ef1))
 
 
-<a name="0.0.6"></a>
-## 0.0.6 (2017-12-09)
-
-
-
-<a name="0.0.5"></a>
-## 0.0.5 (2017-12-09)
-
-
-
-<a name="0.0.4"></a>
-## 0.0.4 (2017-12-09)
-
-
-
-<a name="0.0.3"></a>
-## 0.0.3 (2017-12-08)
-
-
-
-<a name="0.0.2"></a>
-## 0.0.2 (2017-12-08)
 
+<a name="0.0.14"></a>
+## [0.0.14](https://github.com/biancode/node-red-contrib-bacnet/compare/v0.0.9...v0.0.14) (2018-02-19)
 
 
-<a name="0.0.3"></a>
-## 0.0.3 (2017-11-06)
 
+<a name="0.0.9"></a>
+## 0.0.9 (2017-12-09)
 
 
-<a name="0.0.2"></a>
-## 0.0.2 (2017-11-06)
 
-<a name="0.0.1"></a>
-## 0.0.1 (2017-11-05)
diff --git a/package.json b/package.json
index 2ad0096..48b1324 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
     "build": "standard --fix && gulp publish",
     "prepublishOnly": "standard --fix && npm run build && npm test",
     "ci-publish": "ci-publish",
-    "release": "standard-version -a"
+    "release": "standard-version -a",
+    "rewrite-changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
   },
   "files": [
     "docs",