feature 2
Merge pull request #2 from stian0/new-feature-1

feature 2