Merge branch 'master' into feature/add_tests
Merge branch 'master' into feature/add_tests
Add very simple tests (close #3)
Merge branch 'feature/add_tests'