Fix storage hooks
Merge branch 'master' into activity_io
Fix #75