Adding makefile
Merge branch 'feature/makefile'