Add Makefile
Merge branch 'feature/add-makefile' into develop