Update Makefile and requirements.txt
Resolve conflicts
Resolve conflicts again
Merge branch 'enhance/modify-makefile' into develop