Some update
Merge pull request #8 from thomassjogren/dev

Some update