Fix code and add REAMDE