Commit and fixes #1
Merge branch 'new-test-branch'