diff --git a/issue_template/bug.md b/issue_template/bug.md
new file mode 100644
index 0000000..8b7acd0
--- /dev/null
+++ b/issue_template/bug.md
@@ -0,0 +1,21 @@
+---
+
+name: "Bug template"    
+about: "This template is for reporting bugs"  
+title: "Bug"    
+
+---
+
+## Description
+*A clear and concise description of the issue.*
+
+### Selected Fields
+- **Engine:** [Specify the engine used]
+- **Version:** [Specify the version]
+- **Tool:** [Specify the currently used tool]
+
+### Data: 
+*Paste used xml/xslt/json etc...*
+
+## Additional Context
+*Any other information that might help with this issue.*
diff --git a/issue_template/feature.md b/issue_template/feature.md
new file mode 100644
index 0000000..3c491d9
--- /dev/null
+++ b/issue_template/feature.md
@@ -0,0 +1,10 @@
+---
+
+name: "Feature request template"    
+about: "This template is for requesting features"    
+title: "Feature request" 
+
+---
+
+## Feature Request 
+*Describe the feature you’d like to see and why it’s useful.*