implementing Makefile
Merge branch 'feature/makefile' into develop