Proposed changes
Merge pull request #2 from mattisborgen/feature-branch1

Proposed changes