Merge pull request #3 from finninde/master

merging Espen and Master