Merge pull request #11 from torkilv/stianTest

Stian test