Editing
Merge pull request #2 from Fjottnissen/master

Editing