diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..92e6a4a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+Please answer these questions before submitting a bug report.
+
+### What version of godog are you using?
+```
+> godog -version
+```
+
+### What version of Go are you using?
+```
+> go version
+```
+
+### What did you do?
+If possible, provide a recipe for reproducing the error.
+
+### What did you expect to see?
+
+### What did you see instead?
+
+### Additional context
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..4fe86d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..7032767
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,17 @@
+## About to contribute?
+
+We appreciate that. But before you do, please learn our basic rules:
+
+* Do you have a feature request? Then don't expect it to be implemented unless
+  you or someone else sends a [pull request](https://help.github.com/articles/using-pull-requests).
+* We love [pull requests](https://help.github.com/articles/using-pull-requests),
+  but if you don't have a test to go with it we probably won't merge it.
+* Before making significant contribution consider discussing the outline of
+  your solution first. This may avoid a duplication of efforts.
+
+Please do *not* add @author tags - this project embraces collective code
+ownership. If you want to know who wrote some code, look in git. When you are
+done, send a [pull request](http://help.github.com/send-pull-requests/).
+If we get a pull request where an entire file is changed because of
+insignificant whitespace changes we cannot see what you have changed, and your
+contribution might get rejected.
diff --git a/_examples/api/features/version.feature b/_examples/api/features/version.feature
index 950c164..92c0a05 100644
--- a/_examples/api/features/version.feature
+++ b/_examples/api/features/version.feature
@@ -20,6 +20,6 @@ Feature: get version
     And the response should match json:
       """
       {
-        "version": "v0.7.14"
+        "version": "v0.8.1"
       }
       """