Update Makefile
auto-merge staging into master