kkjasdkj
Merge pull request #4 from kjartand/testbranch

what has been done
reviewer has given the go ahead to merge the changes after a thorough review