OMP
Fixed makefile
Merge