Kjetils branch

Pulling kjetils branch back to master