Merge pull request #8 from pixzel/Jens-Holm

Merge fra Jens Holm til Sondre Lind
Merge pull request #10 from pixzel/Sondre-Lind

Merge pull request #8 from pixzel/Jens-Holm