adding makefile targets
Merge branch 'feature/update-makefile' into develop