merge
Merge pull request #7 from RonnyWathne/Ronny_branch

merge