fikset
Merge pull request #9 from thomasSve/master

fikset