Merge of branch

Merge of the branch "Frederik fjoller"