Fixing bug.
Merge branch 'release-1.1' into development
Ephemeral file storage.
Naming storage more sanely.