Issue #81: Enabled storage unawareness.
Issue #81: Addressed pull request comments.
Merge pull request #122 from malawski/storage-unaware

Fixes #81: Enabled storage unawareness.