Improve makefile
Change README.md
Some changes (untested)