Rewrite Makefile
Update README