Fixed error in class storage.
Fixed reading from file. Merging to development.