1
Merge pull request #2 from snorheim/Ronny_branch

Ronny branch
Merge pull request #8 from RonnyWathne/Ronny_branch

1