Merge pull request #198 from smashwilson/storage-consistency

Storage consistency