GH #1: Add support for :storable option