Update Makefile and requirements.txt