diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..cfa55f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,14 @@
+**Do you want to request a *feature* or report a *bug*?**
+- [x] Bug
+- [ ] Feature
+
+**What is the current behavior?**
+
+**If the current behavior is a bug, please provide the steps to reproduce and 
+if possible a minimal demo of the problem with a sample spreadsheet.**
+
+**What is the expected behavior or new feature?**
+
+**Did this work in previous versions of our tool?  Which versions?**
+
+- [ ] I attached a sample spreadsheet.  (You can drag files on to this issue)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..891ee85
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+Fixes # .
+
+Changes proposed in this pull request:
+ - 
+ - 
+ - 
+ 
+How did I test this code:
+ - 
+ - 
+ - 
+ 
+- [ ] I attached a sample spreadsheet.  (You can drag files on to this pull request)
diff --git a/ClosedXML.sln b/ClosedXML.sln
index 5edd50b..4104ff4 100644
--- a/ClosedXML.sln
+++ b/ClosedXML.sln
@@ -18,6 +18,12 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClosedXML_Tests", "ClosedXML_Tests\ClosedXML_Tests.csproj", "{09B066ED-E4A7-4545-A1A4-FF03DD524BDF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{073CFB1C-43DC-4ADC-9D12-BB8D7B10C099}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU