localStorage fallback
Storage initialization extracted
Merge pull request #386 from WonderBeat/storage

Storage Extracted