Remove .o files
Merge branch 'master' into temp