Updated build system
Removing .o
Merging with dev