Added missing obj files
Merged in changes to Makefile