Feature/issue 164 storage efficiency

Fixes #164