Added support for with compact storage.

Fixes #7