Custom storage
Merge pull request #152 from zoozoo-ab/custom-storage

Custom storage