Merge to Oskars master

merge