diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b735373..06c790b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,35 +1,33 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a bug report to help us fix issues
 
 ---
 
+**Affected tool:**
+olevba, mraptor, rtfobj, oleid, etc
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+**File/Malware sample to reproduce the bug**
+Please attach the file in a password protected zip archive, or provide a link where it can be downloaded (e.g. Hybrid Analysis, preferably not VirusTotal which requires paid access). If not possible, please provide a hash.
+
+**How To Reproduce the bug**
+Steps to reproduce the behavior, including the full command line or the options you used.
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+**Console output / Screenshots**
 If applicable, add screenshots to help explain your problem.
+Use the option "-l debug" to add debugging information, if possible.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Version information:**
+ - OS: Windows/Linux/Mac/Other
+ - OS version: x.xx - 32/64 bits
+ - Python version: 2.7/3.6 - 32/64 bits
+ - oletools version: 
 
 **Additional context**
 Add any other context about the problem here.