diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..9c60b8b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear, quick description of the bug.
+
+**How to reproduce it**
+Code or UI interactions that cause the bug.
+
+**How to see it**
+Will it be a console error, a broken animation, an invalid return value, or what?
+
+**Expected behavior**
+A clear, quick description of what should've happened instead.
+
+**More details**
+Your browser, OS, screenshots, etc. Anything that could help.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..3106ccb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: 'Important: AgentMaps is minimal. Most features should be built as separate
+  plugins (like AgentMaps.IconAgents). Want wider features? Build a plugin! Post it
+  here to get it added to the plugins list.'
+
+---
+
+**Did a problem you had inspire this feature request?**
+A clear, quick description of the problem.
+
+**Describe the solution you'd like**
+A clear, quick description of your proposed feature and how it will be incorporated.
+
+**More details**
+Any other ideas, workarounds, or screenshots that could clarify things.
diff --git a/README.md b/README.md
index a71bb43..8384ae8 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,8 @@ You can find the corresponding code under _/demos_ in the gh-pages branch [here]
 
 [IconAgents](https://github.com/noncomputable/AgentMaps-IconAgents): Lets you depict agents with custom icons instead of circles. 
 
+---
+
 Thank you to anyone who somehow benefits from this.
 
 **AgentMaps: Geospatial Agent-based Modeling and Simulation for JavaScript.**