Merge pull request #3 from finninde/master

merging Espen and Master
Merge pull request #4 from finninde/Espen

Merge pull request #3 from finninde/master