Merge pull request #1 from datasektionen/master

Merge pull request #1 from aronstrandberg/master
Merge pull request #2 from aronstrandberg/master

Merge pull request #1 from datasektionen/master