Update code and readme