Merge pull request #1 from markusfrykberg/master

hallå?