Rework Makefile & update Readme