bug fix and add test
Merge branch 'master' of https://github.com/archangel-irk/storage