Added todo
Fixed the class Reader.