Fixed Fredrik fel
Merge origin/master