Updated code and README