diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8b2450f7..2c2952c1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,14 @@
 ## Expected Behavior
+<!--- In English please. -->
+<!--- Tell us what should happen -->
 
-  In English please.
-
-## Actual Behavior
+## Current Behavior
+<!--- In English please. -->
+<!--- Tell us what happens instead of the expected behavior -->
 
+## Possible Solution
+<!--- In English please. -->
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
 
 ## Steps to Reproduce the Problem
 
@@ -11,8 +16,17 @@
   2.
   3.
 
+## Context (Environment)
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+
 ## Specifications
 
-  - OpenMPTCProuter version: (Last is not a version)
-  - OpenMPTCProuter VPS version: (Last is not a version)
-  - OpenMPTCProuter platform: (RPI2/RPI3/x86/x86_64)
+  - OpenMPTCProuter version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter VPS version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter platform: <!--- (RPI2/RPI3/x86/x86_64) -->
+
+<!--- (please do not attach text files) -->
\ No newline at end of file