re-added missing files
Merge branch 'Oskar'