Cleaned some files
Merge branch 'master' into oskar