1
Merge pull request #24 from snorheim/Ronny_branch_4

1