Updated class and readme