First change.
Merge pull request #1 from follesoe/jonas

First change.