before merge
fix for merge
Added makefile