PRtest branch
Merge pull request #1 from NCSkoglund/PRtest

PRtest branch