merged refactor
merged makefile changes
modified makefile