update makefile
update README.md
Merge remote-tracking branch 'origin/master'