Merge pull request #14 from thomassjogren/dev

Dev
merge