Update makefile, readme and compile with maste