Merge pull request #6 from thomassjogren/dev

Dev