Minor code cleaning, Makefile rewritten, README updated
Minor code cleaning, Makefile rewritten, README updated