Merge pull request #17 from Dkendal/2-1-lav

2 1 lav