Merge "Updated makefiles"