Makefile, requirements.txt updated