Merge "Add Makefile to OOM project"