From 63235dce22a789c0868cc34df71c284916894532 Mon Sep 17 00:00:00 2001
From: Henri Vuollekoski <henri.vuollekoski@aalto.fi>
Date: Sat, 3 Dec 2016 20:20:10 +0200
Subject: [PATCH 1/2] Cleaning

---
 LICENSE                               | 2 +-
 docs/conf.py                          | 2 +-
 elfi/__init__.py                      | 2 +-
 {elfi/examples => examples}/ma2.py    | 0
 tests/functional/test_ma2.py          | 2 +-
 tests/unit/test_random_consistency.py | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {elfi/examples => examples}/ma2.py (100%)

diff --git a/LICENSE b/LICENSE
index 56359b8e..7fa1dd18 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016, Helsinki Institute for Information Technology
+Copyright (c) 2016, ELFI Developers and their Assignees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/docs/conf.py b/docs/conf.py
index 8b9c268a..395536c7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -94,7 +94,7 @@ def __getattr__(cls, name):
 
 # General information about the project.
 project = 'ELFI'
-copyright = '2016, Helsinki Institute for Information Technology'
+copyright = '2016, ELFI Developers and their Assignees'
 author = 'ELFI authors'
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/elfi/__init__.py b/elfi/__init__.py
index ce2fa5fe..3854acdc 100644
--- a/elfi/__init__.py
+++ b/elfi/__init__.py
@@ -7,4 +7,4 @@
 
 __author__ = 'ELFI authors'
 __email__ = 'aki.vehtari@aalto.fi'
-__version__ = '0.2.0'
+__version__ = '0.2.2'
diff --git a/elfi/examples/ma2.py b/examples/ma2.py
similarity index 100%
rename from elfi/examples/ma2.py
rename to examples/ma2.py
diff --git a/tests/functional/test_ma2.py b/tests/functional/test_ma2.py
index 37ed1efd..768ee684 100644
--- a/tests/functional/test_ma2.py
+++ b/tests/functional/test_ma2.py
@@ -4,7 +4,7 @@
 import dask
 from elfi.core import *
 from elfi.distributions import *
-from elfi.examples.ma2 import MA2, autocov, distance
+from examples.ma2 import MA2, autocov, distance
 from distributed import Client
 from functools import partial
 
diff --git a/tests/unit/test_random_consistency.py b/tests/unit/test_random_consistency.py
index f3462157..7ffb14a2 100644
--- a/tests/unit/test_random_consistency.py
+++ b/tests/unit/test_random_consistency.py
@@ -1,6 +1,6 @@
 import numpy as np
 from elfi import *
-from elfi.examples.ma2 import *
+from examples.ma2 import *
 
 from functools import partial
 import pytest

From 4c4604e70cc1ad05b3a159027b49b40533deaa73 Mon Sep 17 00:00:00 2001
From: Henri Vuollekoski <henri.vuollekoski@aalto.fi>
Date: Sat, 3 Dec 2016 21:09:13 +0200
Subject: [PATCH 2/2] Added templates for issues and pull request (from PyStan)

---
 .github/ISSUE_TEMPLATE.md        | 28 ++++++++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 19 +++++++++++++++++++
 docs/readme.rst                  |  9 +++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..e211fe2b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+#### Summary:
+Please provide a short couple sentence summary.
+
+
+#### Description:
+Describe the issue as clearly as possible.
+
+
+#### Reproducible Steps:
+Please report steps to reproduce the issue. If it's not possible to reproduce, please include a description of how you discovered the issue.
+
+If you have a reproducible example, please include it.
+
+
+#### Current Output:
+The current output. Knowing what is the current behavior is useful.
+
+
+#### Expected Output:
+Describe what you expect the output to be. Knowing the correct behavior is also very useful.
+
+
+#### ELFI Version:
+
+#### Python Version:
+
+#### Operating System:
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..06304f21
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+#### Summary:
+
+#### Intended Effect:
+
+#### How to Verify:
+
+#### Side Effects:
+
+#### Documentation:
+
+#### Reviewer Suggestions: 
+
+#### Copyright and Licensing
+
+Please list the copyright holder for the work you are submitting (this will be you or your assignee, such as a university or company):
+
+By submitting this pull request, the copyright holder is agreeing to license the submitted work under the following licenses:
+- Code: BSD3 (https://opensource.org/licenses/BSD-3-Clause)
+- Documentation: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
diff --git a/docs/readme.rst b/docs/readme.rst
index 13bd3e15..62367aa2 100644
--- a/docs/readme.rst
+++ b/docs/readme.rst
@@ -20,3 +20,12 @@ Currently implemented ABC methods:
 GitHub page: https://github.com/HIIT/elfi
 
 See examples under the notebooks directory to get started.
+
+Licenses:
+
+- Code: BSD3_
+- Documentation: `CC-BY 4.0`_
+
+.. _BSD3: https://opensource.org/licenses/BSD-3-Clause
+.. _CC-BY 4.0: https://creativecommons.org/licenses/by/4.0
+