Updated code and readme