Universal storage

Fixes the license on @Felger 's original pull request (#99).