Merge pull request #1 from thomassjogren/dev

Silly change.